Move variables from vars to default

Default vars have less precedence than vars/
The variable should have the less precedent in
order to be easily overide by a config file or a
cli args

Change-Id: I12ca26127d550f1faf67c481d7f7f50ad13ca190
This commit is contained in:
Mathieu Bultel 2017-06-23 10:35:52 +02:00
parent 05bab554d8
commit 7ce9352b7f
3 changed files with 17 additions and 7 deletions

View File

@ -1,2 +1,18 @@
---
# defaults file for tripleo-upgrade
# main vars:
working_dir: "{{ lookup('env', 'HOME') }}"
#rc files:
undercloud_rc: "{{ working_dir }}/stackrc"
overcloud_rc: "{{ working_dir }}/overcloudrc"
# upgrade jinja template name:
undercloud_upgrade_template: undercloud_upgrade.sh.j2
# upgrade scripts name:
undercloud_upgrade_script: "{{ working_dir }}/undercloud_upgrade.sh"
overcloud_deploy_script: "{{ working_dir }}/overcloud_deploy.sh"
overcloud_composable_upgrade_script: "{{ working_dir }}/composable_docker_upgrade.sh"
overcloud_converge_upgrade_script: "{{ working_dir }}/converge_docker_upgrade.sh"

View File

@ -1,7 +1,7 @@
---
- name: create undercloud upgrade script
template:
src: undercloud_upgrade.sh.j2
src: "{{ undercloud_upgrade_template }}"
dest: "{{ undercloud_upgrade_script }}"
- name: create composable upgrade scripts

View File

@ -1,8 +1,2 @@
---
# vars file for tripleo-upgrade
overcloud_deploy_script: "~/overcloud_deploy.sh"
undercloud_upgrade_script: "~/undercloud_upgrade.sh"
overcloud_composable_upgrade_script: "~/composable_docker_upgrade.sh"
overcloud_converge_upgrade_script: "~/converge_docker_upgrade.sh"
undercloud_rc: "~/stackrc"
overcloud_rc: "~/overcloudrc"