summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-14 07:29:43 -0800
committerGitHub <noreply@github.com>2018-02-14 07:29:43 -0800
commit07614f8b8d4cd59941d168c4f14ebed49ec8371e (patch)
treeb72da2f039cf53c23dcf791fd820cd6b44921128
parentea96a91a2775321aa60062e25934e22ad8be9de3 (diff)
parentde410074cf5e1e8c2296ce821bc4455e3b7aa693 (diff)
downloadopenshift-07614f8b8d4cd59941d168c4f14ebed49ec8371e.tar.gz
openshift-07614f8b8d4cd59941d168c4f14ebed49ec8371e.tar.bz2
openshift-07614f8b8d4cd59941d168c4f14ebed49ec8371e.tar.xz
openshift-07614f8b8d4cd59941d168c4f14ebed49ec8371e.zip
Merge pull request #7143 from tomassedovic/openstack-shade-usage
Automatic merge from submit-queue. Fix metadata access in OpenStack inventory Some versions of shade (e.g. the one currently in RHEL) only allow a dict-like interface.
-rwxr-xr-xplaybooks/openstack/inventory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/openstack/inventory.py b/playbooks/openstack/inventory.py
index d5a8c3e24..c16a9e228 100755
--- a/playbooks/openstack/inventory.py
+++ b/playbooks/openstack/inventory.py
@@ -89,7 +89,7 @@ def build_inventory():
for server in cluster_hosts:
if 'group' in server.metadata:
- group = server.metadata.group
+ group = server.metadata.get('group')
if group not in inventory:
inventory[group] = {'hosts': []}
inventory[group]['hosts'].append(server.name)