summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-27 17:22:51 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-28 13:50:33 -0400
commitba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4 (patch)
tree0ac9c7ecea0836812a0062164ed67e8c0d7ae5bb /roles
parente3d5519c6d68b9aa162a58e1a897b6e4f6b0eea1 (diff)
downloadopenshift-ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4.tar.gz
openshift-ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4.tar.bz2
openshift-ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4.tar.xz
openshift-ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4.zip
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.yml5
-rw-r--r--roles/openshift_node/defaults/main.yml3
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