summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-07-20 14:53:01 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-07-20 14:53:01 +0200
commit1975fb57b4ddee77eec6f849f2c7677e2ee3d6df (patch)
treef2ca419ffe5fc1353ddfa495be98f452acc9f738 /roles/openstack-stack
parent018d410c4d441a8f66e8ac71d82f4ce46b508364 (diff)
downloadopenshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.gz
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.bz2
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.xz
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.zip
Generate static inventory with shade inventory (#538)
* Autogenerate inventory/hosts when 'inventory: static' (Default), with the shade-inventory tool. * Drop unused anymore: openstack.py and associated GPL notes, an example static inventory, omit manual updates for the inventory DNS names in the deployment guide. * Switch openstack.py formatted inventory hostvars to the shade-inventory format (omit openstack.* from hostvars). * Populate node labels from inventory vars instead of the heat templates combined with inventory vars. * Add app (k8s minions) nodes group for primary node labels. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'roles/openstack-stack')
-rw-r--r--roles/openstack-stack/meta/main.yml3
-rw-r--r--roles/openstack-stack/templates/heat_stack.yaml.j28
2 files changed, 9 insertions, 2 deletions
diff --git a/roles/openstack-stack/meta/main.yml b/roles/openstack-stack/meta/main.yml
new file mode 100644
index 000000000..fdda41bb3
--- /dev/null
+++ b/roles/openstack-stack/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+ - role: common
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2
index 992f6257b..54941db06 100644
--- a/roles/openstack-stack/templates/heat_stack.yaml.j2
+++ b/roles/openstack-stack/templates/heat_stack.yaml.j2
@@ -610,7 +610,9 @@ resources:
type: node
subtype: app
node_labels:
- region: primary
+{% for k, v in openshift_cluster_node_labels.app.iteritems() %}
+ {{ k|e }}: {{ v|e }}
+{% endfor %}
image: {{ openstack_image }}
flavor: {{ node_flavor }}
key_name: {{ ssh_public_key }}
@@ -654,7 +656,9 @@ resources:
type: node
subtype: infra
node_labels:
- region: infra
+{% for k, v in openshift_cluster_node_labels.infra.iteritems() %}
+ {{ k|e }}: {{ v|e }}
+{% endfor %}
image: {{ openstack_image }}
flavor: {{ infra_flavor }}
key_name: {{ ssh_public_key }}