diff options
| -rw-r--r-- | playbooks/openstack/README.md | 6 | ||||
| -rw-r--r-- | roles/etcd/tasks/auxiliary/drop_etcdctl.yml | 2 |
2 files changed, 2 insertions, 6 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 diff --git a/roles/etcd/tasks/auxiliary/drop_etcdctl.yml b/roles/etcd/tasks/auxiliary/drop_etcdctl.yml index 881a8c270..cab835e20 100644 --- a/roles/etcd/tasks/auxiliary/drop_etcdctl.yml +++ b/roles/etcd/tasks/auxiliary/drop_etcdctl.yml @@ -1,7 +1,7 @@ --- - name: Install etcd for etcdctl package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present - when: not openshift_is_atomic | bool + when: not openshift_is_containerized | bool register: result until: result is succeeded |