summaryrefslogtreecommitdiffstats
path: root/playbooks/provisioning
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-08-04 14:12:05 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-08-04 14:12:05 +0200
commitbc73ea59b62f6b24426171c9dc370ad6509e99a7 (patch)
treebcc573a5c8df837b47bcb215dc5620093d989020 /playbooks/provisioning
parent47dd79abd345c18b4d983f45ec35f877b4ea76a6 (diff)
downloadopenshift-bc73ea59b62f6b24426171c9dc370ad6509e99a7.tar.gz
openshift-bc73ea59b62f6b24426171c9dc370ad6509e99a7.tar.bz2
openshift-bc73ea59b62f6b24426171c9dc370ad6509e99a7.tar.xz
openshift-bc73ea59b62f6b24426171c9dc370ad6509e99a7.zip
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).
Diffstat (limited to 'playbooks/provisioning')
-rw-r--r--playbooks/provisioning/openstack/README.md4
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/clouds.yaml5
2 files changed, 0 insertions, 9 deletions
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