summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorClayton Coleman <ccoleman@redhat.com>2017-10-29 16:16:18 -0400
committerClayton Coleman <ccoleman@redhat.com>2017-10-30 23:31:02 -0400
commite56ac91f1f0a54ca428b7838b0cdf91045ddb8e6 (patch)
treefbc46abd8ffc0b149a0a6d5516b8c282fa32382f /roles
parent00aa32cfdb73075ab08083a3c64ffd7ffaa342cf (diff)
downloadopenshift-e56ac91f1f0a54ca428b7838b0cdf91045ddb8e6.tar.gz
openshift-e56ac91f1f0a54ca428b7838b0cdf91045ddb8e6.tar.bz2
openshift-e56ac91f1f0a54ca428b7838b0cdf91045ddb8e6.tar.xz
openshift-e56ac91f1f0a54ca428b7838b0cdf91045ddb8e6.zip
GCP cannot use AWS growpart package
Make the required package optional
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/defaults/main.yml4
-rw-r--r--roles/openshift_node/tasks/bootstrap.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index b9f16dfd4..37f48e724 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -9,7 +9,7 @@ openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' el
openshift_image_tag: ''
-openshift_node_ami_prep_packages:
+default_r_openshift_node_image_prep_packages:
- "{{ openshift_service_type }}-master"
- "{{ openshift_service_type }}-node"
- "{{ openshift_service_type }}-docker-excluder"
@@ -33,7 +33,6 @@ openshift_node_ami_prep_packages:
- python-dbus
- PyYAML
- yum-utils
-- cloud-utils-growpart
# gluster
- glusterfs-fuse
# nfs
@@ -54,6 +53,7 @@ openshift_node_ami_prep_packages:
# - container-selinux
# - atomic
#
+r_openshift_node_image_prep_packages: "{{ default_r_openshift_node_image_prep_packages | union(openshift_node_image_prep_packages | default([])) }}"
openshift_node_bootstrap: False
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index 2deb005da..cf22181a8 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -3,7 +3,7 @@
package:
name: "{{ item }}"
state: present
- with_items: "{{ openshift_node_ami_prep_packages }}"
+ with_items: "{{ r_openshift_node_image_prep_packages }}"
- name: create the directory for node
file: