summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2018-01-23 09:23:28 -0500
committerGitHub <noreply@github.com>2018-01-23 09:23:28 -0500
commit710f368cd1512613fe6f4cdcfd613589e9cfb296 (patch)
tree0b6d8e5c9a0dce062ca11f4b73deb77310df4695 /playbooks/openstack
parentd53d7ed09f3ee0f6be4a90651afcbaed08148431 (diff)
parentcb581bfb67a53f887c4705d45fc7b0024a6816f9 (diff)
downloadopenshift-710f368cd1512613fe6f4cdcfd613589e9cfb296.tar.gz
openshift-710f368cd1512613fe6f4cdcfd613589e9cfb296.tar.bz2
openshift-710f368cd1512613fe6f4cdcfd613589e9cfb296.tar.xz
openshift-710f368cd1512613fe6f4cdcfd613589e9cfb296.zip
Merge pull request #6504 from mbruzek/mbruzek-openshift-openstack
The provision_install file ends in yml not yaml! Ansible requirement …
Diffstat (limited to 'playbooks/openstack')
-rw-r--r--playbooks/openstack/README.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index d64be06e5..842bb34de 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -30,15 +30,17 @@ version 10) or newer. It must also satisfy these requirements:
- look at
the [Minimum Hardware Requirements page][hardware-requirements]
for production
-* The keypair for SSH must be available in openstack
-* `keystonerc` file that lets you talk to the openstack services
+* The keypair for SSH must be available in OpenStack
+* `keystonerc` file that lets you talk to the OpenStack services
* NOTE: only Keystone V2 is currently supported
+* A host with the supported version of [Ansible][ansible] installed, see the
+ [Setup section of the openshift-ansible README][openshift-ansible-setup]
+ for details on the requirements.
Optional:
* External Neutron network with a floating IP address pool
-
## Installation
There are four main parts to the installation:
@@ -68,12 +70,11 @@ First, you need to select where to run [Ansible][ansible] from (the
*Ansible host*). This can be the computer you read this guide on or an
OpenStack VM you'll create specifically for this purpose.
-We will use
-a
+This guide will use a
[Docker image that has all the dependencies installed][control-host-image] to
make things easier. If you don't want to use Docker, take a look at
the [Ansible host dependencies][ansible-dependencies] and make sure
-they're installed.
+they are installed.
Your *Ansible host* needs to have the following:
@@ -222,6 +223,7 @@ advanced configuration:
[ansible]: https://www.ansible.com/
[openshift-ansible]: https://github.com/openshift/openshift-ansible
+[openshift-ansible-setup]: https://github.com/openshift/openshift-ansible#setup
[devstack]: https://docs.openstack.org/devstack/
[tripleo]: http://tripleo.org/
[ansible-dependencies]: ./advanced-configuration.md#dependencies-for-localhost-ansible-controladmin-node