From 4af3f29c7d173eba5e099aee03c15f3b26c2593e Mon Sep 17 00:00:00 2001 From: Yurii Prokulevych Date: Tue, 20 Feb 2018 15:15:14 +0100 Subject: [PATCH] Don't hardcode overcloud stack name. When overcloud is deployed with other name than 'overcloud', credentials file(s) would reflect that. E.g: when overcloud is called 'qe-cloud' credential files are: qe-cloudrc and qe-cloudrc.v3 This chage introduces new variable 'overcloud_stack_name' (default is 'overcloud') and adjusts paths to credentials files, to be derived from stack's name. Change-Id: I75dab2a85d94eb7fd012cd25a3e89720984c25e2 --- defaults/main.yml | 5 ++++- templates/workload_launch.sh.j2 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 88cdbc83..7dba1202 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,9 @@ # main vars: working_dir: "{{ (ansible_env|default({})).HOME|default('/home/stack') }}" +# overcloud stack name +overcloud_stack_name: "overcloud" + # TODO: those variable can be changed for the explicit keyword in tag # when https://github.com/ansible/ansible/issues/11045 is merged. @@ -36,7 +39,7 @@ tripleo_ci: false #rc files: undercloud_rc: "{{ working_dir }}/stackrc" -overcloud_rc: "{{ working_dir }}/overcloudrc" +overcloud_rc: "{{ working_dir }}/{{ overcloud_stack_name }}rc" # launch workload before update/upgrade workload_launch: false diff --git a/templates/workload_launch.sh.j2 b/templates/workload_launch.sh.j2 index a8c2e0b8..09aa0ba2 100644 --- a/templates/workload_launch.sh.j2 +++ b/templates/workload_launch.sh.j2 @@ -2,7 +2,7 @@ # # Script that spawns an instance -OVERCLOUD_RC=~/overcloudrc +OVERCLOUD_RC='{{ overcloud_rc }}' IMAGE_URL='{{ workload_image_url }}' IMAGE_NAME='upgrade_workload' IMAGE_FILE=~/upgrade_workload.qcow2