summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2017-06-14 15:53:45 +0300
committerMarios Andreou <marios@redhat.com>2017-06-14 13:19:14 +0000
commit02910006cd379709e4fab5e3d5373e260e73144b (patch)
tree33adafabf1a227fa7fdecfbbe8e7fda6e9248481
parent94c51d3008996ba8c67a36652541b782b3c06542 (diff)
[Ocata only] Fix inventory - no PublicVip in ocata tht
The PublicVip output doesn't exist in stable/ocata deployments so remove this from the inventory otherwise it will fail some validations Change-Id: Icc39371af43a28111d3af01e7d61f29eb284cd24 Closes-Bug: 1697940
Notes
Notes (review): Code-Review+2: Martin André <m.andre@redhat.com> Code-Review+2: Florian Fuchs <flfuchs@redhat.com> Workflow+1: Florian Fuchs <flfuchs@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 15 Jun 2017 11:26:29 +0000 Reviewed-on: https://review.openstack.org/474189 Project: openstack/tripleo-validations Branch: refs/heads/stable/ocata
-rwxr-xr-xscripts/tripleo-ansible-inventory5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/tripleo-ansible-inventory b/scripts/tripleo-ansible-inventory
index 8c87262..d255859 100755
--- a/scripts/tripleo-ansible-inventory
+++ b/scripts/tripleo-ansible-inventory
@@ -124,11 +124,8 @@ class TripleoInventory(object):
124 } 124 }
125 } 125 }
126 126
127 public_vip = self.get_overcloud_output('PublicVip')
128 if public_vip:
129 ret['undercloud']['vars']['overcloud_public_vip'] = public_vip
130 keystone_url = self.get_overcloud_output('KeystoneURL') 127 keystone_url = self.get_overcloud_output('KeystoneURL')
131 if public_vip: 128 if keystone_url:
132 ret['undercloud']['vars']['overcloud_keystone_url'] = keystone_url 129 ret['undercloud']['vars']['overcloud_keystone_url'] = keystone_url
133 overcloud_environment = self.get_overcloud_environment() 130 overcloud_environment = self.get_overcloud_environment()
134 passwords = overcloud_environment.get('passwords', {}) 131 passwords = overcloud_environment.get('passwords', {})