From 5a99c7b6acf1c4bc0f1a83af77bf434ac5b45548 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Fri, 8 Dec 2017 11:54:36 +0100
Subject: Fix yaml syntax error in the sample inventory
---
playbooks/openstack/sample-inventory/group_vars/OSEv3.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
index 933117127..481807dc9 100644
--- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -14,12 +14,12 @@ openshift_hosted_router_wait: True
openshift_hosted_registry_wait: True
## Openstack credentials
-#openshift_cloudprovider_kind=openstack
+#openshift_cloudprovider_kind: openstack
#openshift_cloudprovider_openstack_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
#openshift_cloudprovider_openstack_username: "{{ lookup('env','OS_USERNAME') }}"
#openshift_cloudprovider_openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
#openshift_cloudprovider_openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
-#openshift_cloudprovider_openstack_region="{{ lookup('env', 'OS_REGION_NAME') }}"
+#openshift_cloudprovider_openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
## Use Cinder volume for Openshift registry:
--
cgit v1.2.3
From ff1d04276bbc8a7542ff0e33a12e1b971e2745b7 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Tue, 2 Jan 2018 16:11:29 +0100
Subject: Return a openshift_node_labels as a dict
The OpenStack dynamic inventory was setting the
`openshift_node_labels` value as a string which causes a failure with
the `lib_utils_oo_dict_to_keqv_list` filter.
Fixes #6555
---
playbooks/openstack/sample-inventory/inventory.py | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'playbooks')
diff --git a/playbooks/openstack/sample-inventory/inventory.py b/playbooks/openstack/sample-inventory/inventory.py
index ad3fd936b..55d2f7211 100755
--- a/playbooks/openstack/sample-inventory/inventory.py
+++ b/playbooks/openstack/sample-inventory/inventory.py
@@ -9,6 +9,7 @@ environment.
from __future__ import print_function
+from collections import Mapping
import json
import shade
@@ -94,6 +95,10 @@ def build_inventory():
hostvars['openshift_public_hostname'] = server.name
node_labels = server.metadata.get('node_labels')
+ # NOTE(shadower): the node_labels value must be a dict not string
+ if not isinstance(node_labels, Mapping):
+ node_labels = json.loads(node_labels)
+
if node_labels:
hostvars['openshift_node_labels'] = node_labels
--
cgit v1.2.3
From b7833d6684a238713821cc5e0eb2fa7be99c8197 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Tue, 2 Jan 2018 16:14:01 +0100
Subject: Import prerequisites.yml for OpenStack
---
playbooks/openstack/openshift-cluster/install.yml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'playbooks')
diff --git a/playbooks/openstack/openshift-cluster/install.yml b/playbooks/openstack/openshift-cluster/install.yml
index 3211f619a..2ab7d14a0 100644
--- a/playbooks/openstack/openshift-cluster/install.yml
+++ b/playbooks/openstack/openshift-cluster/install.yml
@@ -8,5 +8,8 @@
# values here. We do it in the OSEv3 group vars. Do we need to add
# some logic here?
+- name: run the cluster deploy
+ import_playbook: ../../prerequisites.yml
+
- name: run the cluster deploy
import_playbook: ../../deploy_cluster.yml
--
cgit v1.2.3