diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-29 22:25:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 22:25:19 -0700 |
| commit | 1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd (patch) | |
| tree | 6daefe4dc950f91e7e864595fe38a31ed1c62876 /roles | |
| parent | d1e51603d4cc7a3b7ad8381c730ac51ae4037139 (diff) | |
| parent | ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4 (diff) | |
| download | openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.gz openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.bz2 openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.xz openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.zip | |
Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-support
Automatic merge from submit-queue.
Changes necessary to support AMI building
Currently, AMI building does not work.
These changes implement the necessary steps to build
an AMI for usage as a 'golden node image'.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_aws/tasks/iam_cert.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_aws/tasks/iam_cert.yml b/roles/openshift_aws/tasks/iam_cert.yml index cd9772a25..d902e7a42 100644 --- a/roles/openshift_aws/tasks/iam_cert.yml +++ b/roles/openshift_aws/tasks/iam_cert.yml @@ -22,6 +22,11 @@ - name: set_fact openshift_aws_elb_cert_arn set_fact: openshift_aws_elb_cert_arn: "{{ elb_cert_chain.arn }}" + when: + - openshift_aws_create_iam_cert | bool + - openshift_aws_iam_cert_path != '' + - openshift_aws_iam_cert_key_path != '' + - openshift_aws_elb_cert_arn == '' - name: wait for cert to propagate pause: diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index ed3516d04..1214c08e5 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -31,12 +31,9 @@ openshift_node_ami_prep_packages: - python-dbus - PyYAML - yum-utils -- python2-boto -- python2-boto3 - cloud-utils-growpart # gluster - glusterfs-fuse -- heketi-client # nfs - nfs-utils - flannel |