summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-15 11:26:05 -0800
committerGitHub <noreply@github.com>2018-01-15 11:26:05 -0800
commitc81d1ba2408137d64009bbc4842123835a2be41f (patch)
tree5e8c06ed63a7b3b5ec7cccd9550fb1b4290951b9
parent5389f549e815c40198801ee5d7f887d44745e44a (diff)
parent9608e45adceaf3ce606bdbf582a48094db66b3ab (diff)
downloadopenshift-c81d1ba2408137d64009bbc4842123835a2be41f.tar.gz
openshift-c81d1ba2408137d64009bbc4842123835a2be41f.tar.bz2
openshift-c81d1ba2408137d64009bbc4842123835a2be41f.tar.xz
openshift-c81d1ba2408137d64009bbc4842123835a2be41f.zip
Merge pull request #6726 from bogdando/fix_openstack_docs
Automatic merge from submit-queue. Fix openstack provider docs Fix openstack provider playbook name in docs Adjust required versions of dependencies. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
-rw-r--r--playbooks/openstack/README.md2
-rw-r--r--playbooks/openstack/advanced-configuration.md7
2 files changed, 4 insertions, 5 deletions
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index d361d6278..2e5cacc76 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -184,7 +184,7 @@ resources:
```bash
$ ansible-playbook --user openshift -i inventory \
- openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yaml \
+ openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yml \
-e openshift_repos_enable_testing=true
```
diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md
index afa56d168..e8f4cfc32 100644
--- a/playbooks/openstack/advanced-configuration.md
+++ b/playbooks/openstack/advanced-configuration.md
@@ -1,9 +1,8 @@
## Dependencies for localhost (ansible control/admin node)
-* [Ansible 2.3](https://pypi.python.org/pypi/ansible)
-* [Ansible-galaxy](https://pypi.python.org/pypi/ansible-galaxy-local-deps)
-* [jinja2](http://jinja.pocoo.org/docs/2.9/)
-* [shade](https://pypi.python.org/pypi/shade)
+* [Ansible](https://pypi.python.org/pypi/ansible) version >=2.4.0
+* [jinja2](http://jinja.pocoo.org/docs/2.9/) version >= 2.10
+* [shade](https://pypi.python.org/pypi/shade) version >= 1.26
* python-jmespath / [jmespath](https://pypi.python.org/pypi/jmespath)
* python-dns / [dnspython](https://pypi.python.org/pypi/dnspython)
* Become (sudo) is not required.