From f3eee9e2131a59e2a0995c53c07001f24f9187a2 Mon Sep 17 00:00:00 2001 From: Samuli Silvius Date: Sun, 10 Feb 2019 13:24:03 +0200 Subject: More default values and simplify onap config Populate more default values for ansible all.yml configuration to make it simpler by default for user. Removed project_configuration variable as it caused just confusion. Replaced that mostly by using app_name variable. According to above changed simplified actual configuration config/application_configuration.yml used to install onap. Mostly removed repeation of comments. Also updated ansible/application/README.md that was not updated for a while. Issue-ID: OOM-1633 Change-Id: Idcc4c510b64bb61edd874d0e0616cdb41938f2d3 Signed-off-by: Samuli Silvius --- ansible/application/README.md | 29 +++++++++-------------------- ansible/group_vars/all.yml | 20 +++++++------------- 2 files changed, 16 insertions(+), 33 deletions(-) (limited to 'ansible') diff --git a/ansible/application/README.md b/ansible/application/README.md index 342240be..d260b3cb 100644 --- a/ansible/application/README.md +++ b/ansible/application/README.md @@ -1,8 +1,8 @@ # Application specific configuration This directory is **empty** on purpose in git. Content in this folder is -placed on installer packaging time and can be modified by user on target -server where installer package is installed. +populated packaging time (see package.sh/package.conf) and can be modified if needed +also on target server where package is installed. ## Application configuration @@ -20,34 +20,20 @@ Example: Application helm charts must be available on infra node before application playbook is executed. That folder on infra node is specified within `app_helm_charts_infra_directory` variable. -Helm charts folder name is configured on `application_configuration.yml` file -with `app_helm_charts_directory` variable - it is the path on remote infrastructure server. - -Example: -``` -app_helm_charts_directory: /opt/application/helm_charts -``` - -It is expected that helm charts are available from packaging script as a part of installer SW package. -Such source directory of helm charts is specified by `app_helm_charts_install_directory` variable - -Example: -``` -app_helm_charts_install_directory: ansible/application/helm_charts/kubernetes -``` +There is a good default value for this variable and if not changed, installer will handle +Helm charts transfer from packaging up to the target infra server. ## Application specific roles Installer supports optional custom pre and post install roles. Custom roles' code folders -need to be placed to this directory and name of those folders are configured in +are placed to this directory at packaging time and name of those folders are configured in application.yml with variable `application_pre_install_role` and `application_post_install_role`. Example: ``` -application_pre_install_role: "{{ project_configuration }}-patch-role" +application_pre_install_role: "{{ app_name }}-patch-role" ``` - ## Inventory hosts Ansible inventory file is least application specific but in practice example @@ -56,3 +42,6 @@ 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. diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index dbb05205..cd8c7f58 100755 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -65,7 +65,7 @@ deploy_rpm_repository: yes # Offline solution is deploying app specific rpm repository and requires some name # also for k8s cluster -# e.g. app_name: ONAP +# e.g. app_name: onap app_name: # runtime_images provides an way to insert docker images @@ -90,12 +90,6 @@ runtime_images: # Application specific params # ############################### -# Project name to utilize same codebase. Just helper variable inside ansible -# configuration files (like this file) to avoid writing own project name multiple -# times for paths, namespaces, Helm release, derived variables.. -# e.g. project_configuration: onap-casablanca -project_configuration: - # App Helm charts directory location in installation package. # The path is absolute path (even locates relative inside of this sw package # installation folder) because it must be visible for ansible docker/chroot @@ -116,7 +110,7 @@ app_helm_charts_infra_directory: "{{ app_data_path }}/helm_charts" # Main Helm chart to install # e.g. app_helm_chart_name: onap -app_helm_chart_name: +app_helm_chart_name: "{{ app_name }}" # Targets for helm charts repository build # e.g. for ONAP Casablanca @@ -128,19 +122,19 @@ app_helm_build_targets: # Directory with helm plugins # It's an optional parameter used e.g. in OOM Casablanca # app_helm_plugins_directory: "{{ app_helm_charts_install_directory}}/helm/plugins/" -app_helm_plugins_directory: +app_helm_plugins_directory: "{{ app_helm_charts_install_directory}}/helm/plugins/" # Helm release name (visible in POD names) used by Helm -# e.g. app_helm_release_name: "{{ project_configuration }}" -app_helm_release_name: "{{ project_configuration }}" +# e.g. app_helm_release_name: onap +app_helm_release_name: "{{ app_name }}" # Kubernetes namespace where application is installed # e.g. app_kubernetes_namespace: onap -app_kubernetes_namespace: +app_kubernetes_namespace: "{{ app_name }}" # Optional application custom Ansible roles name for pre and post install logic. # Location of additional custom roles is defined in ansible.cfg with roles_path. -# e.g. application_pre_install_role: "{{ project_configuration }}-patch-role" +# e.g. application_pre_install_role: "{{ app_name }}-patch-role" application_pre_install_role: application_post_install_role: -- cgit 1.2.3-korg