From ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Wed, 27 Sep 2017 17:22:51 -0400 Subject: 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'. --- roles/openshift_aws/tasks/iam_cert.yml | 5 +++++ roles/openshift_node/defaults/main.yml | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'roles') 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 -- cgit v1.2.3