From 840e9ef14441274f5f8042c195396037b885ad79 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Date: Mon, 20 Mar 2017 10:13:49 +0100 Subject: 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 --- openstack-ansible/scripts/osa_deploy.sh | 1 - openstack-ansible/var/ubuntu.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'openstack-ansible') 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'}} -- cgit 1.2.3-korg