summaryrefslogtreecommitdiffstats
path: root/ansible/group_vars
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2019-02-10 13:24:03 +0200
committerSamuli Silvius <s.silvius@partner.samsung.com>2019-02-13 09:13:42 +0200
commitf3eee9e2131a59e2a0995c53c07001f24f9187a2 (patch)
tree731e835b08e351ec10e701172eede4c0bd976a6b /ansible/group_vars
parent426e6c09fe0c8a0d0c35631231f023eaf8823775 (diff)
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 <s.silvius@partner.samsung.com>
Diffstat (limited to 'ansible/group_vars')
-rwxr-xr-xansible/group_vars/all.yml20
1 files changed, 7 insertions, 13 deletions
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: