Browse Source

GCP cannot use AWS growpart package

Make the required package optional
Clayton Coleman 7 years ago
parent
commit
e56ac91f1f

+ 2 - 0
playbooks/aws/openshift-cluster/build_ami.yml

@@ -28,6 +28,8 @@
     set_fact:
       ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default(ansible_ssh_user) }}"
       openshift_node_bootstrap: True
+      openshift_node_image_prep_packages:
+      - cloud-utils-growpart
 
 # This is the part that installs all of the software and configs for the instance
 # to become a node.

+ 2 - 2
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
 

+ 1 - 1
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: