summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-07-19 16:38:56 +0200
committerGitHub <noreply@github.com>2017-07-19 16:38:56 +0200
commitd6c06b1bb0c07e5dd107538af4d2b3e4b575a3cd (patch)
tree42ee69f215205290295b867cb867c373cfbf99d5
parent316fe94d1d8960d325c19954e2984b61ff215dcf (diff)
parent63e623561f8fbc54e87248edf789b6c5d395cf26 (diff)
downloadopenshift-d6c06b1bb0c07e5dd107538af4d2b3e4b575a3cd.tar.gz
openshift-d6c06b1bb0c07e5dd107538af4d2b3e4b575a3cd.tar.bz2
openshift-d6c06b1bb0c07e5dd107538af4d2b3e4b575a3cd.tar.xz
openshift-d6c06b1bb0c07e5dd107538af4d2b3e4b575a3cd.zip
Merge pull request #563 from tomassedovic/openshift-ansible-sudo
Set ansible_become for the OSEv3 group
-rw-r--r--playbooks/provisioning/openstack/README.md2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index 5c2f61202..ac648a559 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -181,7 +181,7 @@ file, this is how you stat the provisioning process:
Once it succeeds, you can install openshift by running:
- ansible-playbook --become --user openshift --private-key ~/.ssh/openshift -i inventory/ openshift-ansible/playbooks/byo/config.yml
+ ansible-playbook --user openshift --private-key ~/.ssh/openshift -i inventory/ openshift-ansible/playbooks/byo/config.yml
## License
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
index 70e4d8cb1..4ce96a031 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -19,3 +19,7 @@ openshift_override_hostname_check: true
# For POCs or demo environments that are using smaller instances than
# the official recommended values for RAM and DISK, uncomment the line below.
#openshift_disable_check: disk_availability,memory_availability
+
+# NOTE(shadower): Always switch to root on the OSEv3 nodes.
+# openshift-ansible requires an explicit `become`.
+ansible_become: true