summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-19 05:14:45 -0800
committerGitHub <noreply@github.com>2018-01-19 05:14:45 -0800
commit7eee4914398913674df1128e8396cc8fb64cedb1 (patch)
tree1b929fd6f10f158d60f3e3519c0bab1cd8814c91 /playbooks/openstack
parent32b1287b26c7a3e047d51fd63b5ab3a08fa4c0f1 (diff)
parent5dbb883e15bc0dfbe4e50e95887174f3d6e09a49 (diff)
downloadopenshift-7eee4914398913674df1128e8396cc8fb64cedb1.tar.gz
openshift-7eee4914398913674df1128e8396cc8fb64cedb1.tar.bz2
openshift-7eee4914398913674df1128e8396cc8fb64cedb1.tar.xz
openshift-7eee4914398913674df1128e8396cc8fb64cedb1.zip
Merge pull request #6771 from tomassedovic/fix-readme
Automatic merge from submit-queue. Drop the testing repo var from openstack readme This was introduced as a temporary fix for the origin+centos deployments. It is no longer necessary and it's confusing to newcomers.
Diffstat (limited to 'playbooks/openstack')
-rw-r--r--playbooks/openstack/README.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index fb621f898..2e8231ccc 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -186,13 +186,9 @@ resources:
$ ansible-playbook --user openshift \
-i openshift-ansible/playbooks/openstack/inventory.py
-i inventory \
- openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yml \
- -e openshift_repos_enable_testing=true
+ openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yml
```
-Note, you may want to use the testing repo for development purposes only.
-Normally, `openshift_repos_enable_testing` should not be specified.
-
In addition to *your* inventory with your OpenShift and OpenStack
configuration, we are also supplying the [dynamic inventory][dynamic] from
`openshift-ansible/inventory`. It's a script that will look at the Nova servers