diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/application/README.md | 12 | ||||
| -rwxr-xr-x | ansible/group_vars/all.yml | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ansible/application/README.md b/ansible/application/README.md index 36f69bd5..0e12da42 100644 --- a/ansible/application/README.md +++ b/ansible/application/README.md @@ -1,7 +1,7 @@ # Application specific configuration This directory is **empty** on purpose in git. Content in this folder is -populated packaging time (see package.sh/package.conf) and can be modified if needed +populated in packaging time by build/package.py and can be modified if needed also on target server where package is installed. ## Application configuration @@ -29,8 +29,6 @@ Helm charts transfer from packaging up to the target infra server. Installer supports optional custom pre and post install roles. Custom roles' code folders are placed into this directory at packaging time and names of those folders shall be configured in application_configuration.yml with variable `application_pre_install_role` and `application_post_install_role`. -Note that these directory names must correspond to those configured in APP_CONFIGURATION inside package.conf -during package build time. Example: ``` @@ -44,7 +42,7 @@ inventory file in git ansible/inventory/hosts.yml cannot be directly used anyway and at least ip addresses need to be changed according to target servers after installer installation and before starting installer execution. -So it's better to place also hosts.yml to this application directory and edit it here. -That can be done either at packaging time same way as application_configuration.yml -or after package has been installed to server where ansible process are run just -before lauching any playbooks. +So it's better to place also hosts.yml to this application directory and edit it there. +That can be done either at packaging time same way as in application_configuration.yml +or after package has been installed to the install server where ansible process are run just +before launching any playbooks. diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index d8fe37dd..d3cdfc1d 100755 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -9,14 +9,11 @@ resources_dir: # tarfile name within resources_dir directory with offline infrastructure binaries. -# Content of APP_BINARY_RESOURCES_DIR (defined in package.conf) packaged by package.sh to single tar file. resources_filename: # tarfile name within resources_dir directory with auxiliary resources. -# Content of APP_AUX_BINARIES (defined in package.conf) packaged by package.sh to single tar file. # the purpose of auxiliary resources is to provide user an interface # to distribute to infra node tar file with application specific files. -# Docker images in tar format are currently the only supported content of aux_resources package. aux_resources_filename: # resources can be exported via nfs @@ -101,9 +98,6 @@ runtime_images: {} # Helm repository. # Content of the folder must be Helm chart directories of the app with Makefile. # In case of ONAP OOM it would be <oom_repo>/kubernetes folder content. -# NOTE: This default value should not be changed if not really needed and it -# must match with the variable "HELM_CHARTS_DIR_IN_PACKAGE" value in package.sh -# script! app_helm_charts_install_directory: application/helm_charts # Specify target dir where helm charts are copied into on infra node. |