From bc73ea59b62f6b24426171c9dc370ad6509e99a7 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Fri, 4 Aug 2017 14:12:05 +0200
Subject: Remove clouds.yaml from sample-inventory
With the move to the static inventory, we don't need it anymore so it's
now just an unnecessary step in the deployment.
Note that the users may still want to use clouds.yaml for openstack
credentials instead of sourcing the `OS_*` environment variables, but
they can do that at their discression.
The reason we had the clouds.yaml here was because the `openstack.py`
dynamic inventory used the servers' UUID's as ansible hosts by default
and the options we put in caused it to use the hostnames (as desired).
---
playbooks/provisioning/openstack/README.md | 4 ----
playbooks/provisioning/openstack/sample-inventory/clouds.yaml | 5 -----
2 files changed, 9 deletions(-)
delete mode 100644 playbooks/provisioning/openstack/sample-inventory/clouds.yaml
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index 8e99dd14b..c7b2ea975 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -63,10 +63,6 @@ Otherwise, even if there are differences between the two versions, installation
cp -r openshift-ansible-contrib/playbooks/provisioning/openstack/sample-inventory inventory
-### Copy clouds.yaml
-
- cp openshift-ansible-contrib/playbooks/provisioning/openstack/sample-inventory/clouds.yaml clouds.yaml
-
### Copy ansible config
cp openshift-ansible-contrib/playbooks/provisioning/openstack/sample-inventory/ansible.cfg ansible.cfg
diff --git a/playbooks/provisioning/openstack/sample-inventory/clouds.yaml b/playbooks/provisioning/openstack/sample-inventory/clouds.yaml
deleted file mode 100644
index 8182d2995..000000000
--- a/playbooks/provisioning/openstack/sample-inventory/clouds.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-ansible:
- use_hostnames: True
- expand_hostvars: True
- fail_on_errors: True
--
cgit v1.2.3