diff options
| author | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-07-20 14:53:01 +0200 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-07-20 14:53:01 +0200 |
| commit | 1975fb57b4ddee77eec6f849f2c7677e2ee3d6df (patch) | |
| tree | f2ca419ffe5fc1353ddfa495be98f452acc9f738 /roles/static_inventory | |
| parent | 018d410c4d441a8f66e8ac71d82f4ce46b508364 (diff) | |
| download | openshift-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/static_inventory')
| -rw-r--r-- | roles/static_inventory/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/static_inventory/templates/inventory.j2 | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/roles/static_inventory/meta/main.yml b/roles/static_inventory/meta/main.yml new file mode 100644 index 000000000..fdda41bb3 --- /dev/null +++ b/roles/static_inventory/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: common diff --git a/roles/static_inventory/templates/inventory.j2 b/roles/static_inventory/templates/inventory.j2 index ba806f286..9d129cf10 100644 --- a/roles/static_inventory/templates/inventory.j2 +++ b/roles/static_inventory/templates/inventory.j2 @@ -19,6 +19,11 @@ #[all:vars] # For all group_vars, see ./group_vars/all.yml +[infra_hosts:vars] +openshift_node_labels={{ openshift_cluster_node_labels.infra | to_json | quote }} + +[app:vars] +openshift_node_labels={{ openshift_cluster_node_labels.app | to_json | quote }} # Create an OSEv3 group that contains the master, nodes, etcd, and lb groups. # The lb group lets Ansible configure HAProxy as the load balancing solution. @@ -28,7 +33,6 @@ OSEv3 dns [OSEv3:children] -masters nodes etcd @@ -54,6 +58,9 @@ nodes.{{ stack_name }} [infra_hosts:children] infra.{{ stack_name }} +[app:children] +nodes.{{ stack_name }} + [dns:children] dns.{{ stack_name }} @@ -62,6 +69,7 @@ dns.{{ stack_name }} [etcd.{{ stack_name }}] [infra.{{ stack_name }}] [nodes.{{ stack_name }}] +[app.{{ stack_name }}] [dns.{{ stack_name }}] # BEGIN Autogenerated groups |