diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-31 11:33:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 11:33:16 -0700 |
| commit | 4a7f64a2d692ebbeb03d696b648762f4be784f6d (patch) | |
| tree | e2e7b94a738b5dc657b4ee7d00b28f6f7ad60db5 /roles/openshift_node | |
| parent | 3e2f7911f08504e7da8344df28f008a81897c329 (diff) | |
| parent | 971e224650387a873e01af29bf135f47ab2f6980 (diff) | |
| download | openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.gz openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.bz2 openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.xz openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.zip | |
Merge pull request #5924 from smarterclayton/bootstrap_cleanup
Automatic merge from submit-queue.
GCP cannot use growpart utils from AWS due to conflicting package
Allow cloud provider specific packages to be specified. Also, fix a wait condition in openshift_gcp to allow masters to be bootstrapped nodes.
@kwoodson
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 2 |
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: |