summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--playbooks/provisioning/openstack/README.md2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml4
-rw-r--r--roles/openshift-prep/defaults/main.yml2
-rw-r--r--roles/openshift-prep/tasks/prerequisites.yml7
4 files changed, 14 insertions, 1 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index 6dd60cd88..a92bc8837 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -187,7 +187,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
diff --git a/roles/openshift-prep/defaults/main.yml b/roles/openshift-prep/defaults/main.yml
index fac25dcc1..c8c9a00c0 100644
--- a/roles/openshift-prep/defaults/main.yml
+++ b/roles/openshift-prep/defaults/main.yml
@@ -1,11 +1,13 @@
---
# Defines either to install required packages and update all
manage_packages: true
+install_debug_packages: false
required_packages:
- wget
- git
- net-tools
- bind-utils
- bridge-utils
+debug_packages:
- bash-completion
- vim-enhanced
diff --git a/roles/openshift-prep/tasks/prerequisites.yml b/roles/openshift-prep/tasks/prerequisites.yml
index 433c1c4e3..b7601aa48 100644
--- a/roles/openshift-prep/tasks/prerequisites.yml
+++ b/roles/openshift-prep/tasks/prerequisites.yml
@@ -9,6 +9,13 @@
with_items: "{{ required_packages }}"
when: manage_packages|bool
+- name: "Install debug packages (optional)"
+ yum:
+ name: "{{ item }}"
+ state: latest
+ with_items: "{{ debug_packages }}"
+ when: install_debug_packages|bool
+
- name: "Update all packages (this can take a very long time)"
yum:
name: '*'