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 /playbooks | |
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 'playbooks')
-rw-r--r-- | playbooks/aws/openshift-cluster/build_ami.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml index 5b4a6a1e8..fae30eb0a 100644 --- a/playbooks/aws/openshift-cluster/build_ami.yml +++ b/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. |