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/pre_tasks.yml | |
| 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/pre_tasks.yml')
| -rw-r--r-- | playbooks/provisioning/openstack/pre_tasks.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/playbooks/provisioning/openstack/pre_tasks.yml b/playbooks/provisioning/openstack/pre_tasks.yml index a4ff7c4ac..d73945644 100644 --- a/playbooks/provisioning/openstack/pre_tasks.yml +++ b/playbooks/provisioning/openstack/pre_tasks.yml @@ -15,12 +15,6 @@ env_id: "{{ env_id | default(default_env_id) }}" delegate_to: localhost -- name: Set Dynamic Inventory Filters - become: false - shell: > - export OS_INV_FILTER_KEY=clusterid && export OS_INV_FILTER_VALUE={{ env_id }} - delegate_to: localhost - - name: Updating DNS domain to include env_id (if not empty) set_fact: full_dns_domain: "{{ (env_id|trim == '') | ternary(public_dns_domain, env_id + '.' + public_dns_domain) }}" |