From 63e623561f8fbc54e87248edf789b6c5d395cf26 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 19 Jul 2017 15:45:04 +0200
Subject: Set ansible_become for the OSEv3 group

Because openshift-ansible requires root on the cluster nodes, but it
doesn't explicitly set it in the playbooks (like we do), let's set it
in our inventory instead of requiring to pass `--become` to
`ansible-playbook`.

That will simplify the installation steps as well as let us include
the provisioning and openshift-ansible playbooks in a single playbook.
---
 playbooks/provisioning/openstack/README.md                            | 2 +-
 .../provisioning/openstack/sample-inventory/group_vars/OSEv3.yml      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'playbooks/provisioning/openstack')

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
-- 
cgit v1.2.3