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 /playbooks/provisioning/openstack/sample-inventory/group_vars | |
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 'playbooks/provisioning/openstack/sample-inventory/group_vars')
-rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml index 4ce96a031..a16c1d867 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml @@ -5,9 +5,11 @@ openshift_release: 1.5.1 #openshift_release: v3.5 openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}" -# NOTE(shadower): do not remove this line, otherwise the default node labels -# won't be set up. -openshift_node_labels: "{{ openstack.metadata.node_labels }}" +#openshift_cluster_node_labels: +# app: +# region: primary +# infra: +# region: infra osm_default_node_selector: 'region=primary' |