diff options
| author |   Yolanda Robla <yroblamo@redhat.com> | 2017-03-20 10:13:49 +0100 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 840e9ef14441274f5f8042c195396037b885ad79 (patch) | |
| tree | fab7eb696e7347e71cb53b21d625c5820caf6a98 /openstack-ansible | |
| parent | e6bfbe1e20142a14f2fac7c4f5f6d1261263994f (diff) | |
Read OSA_BRANCH from an env var
Currently the OSA_BRANCH was sent in the deploy script,
but not being picked by ansible. Enable this OSA_BRANCH in
ansible, that will read from the populated env var in the
deploy script.
Change-Id: I77cffaee647a6f2a67baa49b1ddf022061398d86
Diffstat (limited to 'openstack-ansible')
| -rwxr-xr-x | openstack-ansible/scripts/osa_deploy.sh | 1 | ||||
| -rw-r--r-- | openstack-ansible/var/ubuntu.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/openstack-ansible/scripts/osa_deploy.sh b/openstack-ansible/scripts/osa_deploy.sh index 95f59319..79625d21 100755 --- a/openstack-ansible/scripts/osa_deploy.sh +++ b/openstack-ansible/scripts/osa_deploy.sh @@ -4,7 +4,6 @@ export OSA_PATH=/opt/openstack-ansible export LOG_PATH=$OSA_PATH/log export PLAYBOOK_PATH=$OSA_PATH/playbooks export OSA_BRANCH=${OSA_BRANCH:-"master"} - JUMPHOST_IP="192.168.122.2" sudo /bin/rm -rf $LOG_PATH diff --git a/openstack-ansible/var/ubuntu.yml b/openstack-ansible/var/ubuntu.yml index 71f54ecb..9464384b 100644 --- a/openstack-ansible/var/ubuntu.yml +++ b/openstack-ansible/var/ubuntu.yml @@ -2,5 +2,7 @@ OSA_URL: https://git.openstack.org/openstack/openstack-ansible OSA_PATH: /opt/openstack-ansible OSA_ETC_PATH: /etc/openstack_deploy +OSA_BRANCH: "{{ lookup('env','OSA_BRANCH') }}" + JUMPHOST_IP: 192.168.122.2 host_info: {'jumphost':{'MGMT_IP': '172.29.236.10','VLAN_IP': '192.168.122.2', 'STORAGE_IP': '172.29.244.10'},'controller00':{'MGMT_IP': '172.29.236.11','VLAN_IP': '192.168.122.3', 'STORAGE_IP': '172.29.244.11'},'controller01':{'MGMT_IP': '172.29.236.12','VLAN_IP': '192.168.122.4', 'STORAGE_IP': '172.29.244.12'},'controller02':{'MGMT_IP': '172.29.236.13','VLAN_IP': '192.168.122.5', 'STORAGE_IP': '172.29.240.13'},'compute00':{'MGMT_IP': '172.29.236.14','VLAN_IP': '192.168.122.6','VLAN_IP_SECOND': '173.29.241.1','VXLAN_IP': '172.29.240.14', 'STORAGE_IP': '172.29.244.14'},'compute01':{'MGMT_IP': '172.29.236.15','VLAN_IP': '192.168.122.7','VLAN_IP_SECOND': '173.29.241.2','VXLAN_IP': '172.29.240.15', 'STORAGE_IP': '172.29.244.15'}} |