summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-02-27 10:54:24 -0500
committerStephen Milner <stevem@gnulinux.net>2017-02-27 17:06:33 -0500
commit7459157413c00148ec387447a1256980626b4e91 (patch)
treed57167ab6d848bcea153b00d24cf4a1ebbaa4257
parent0550138a592bc3bf202a44ed9a3e4d575e70add3 (diff)
downloadopenshift-7459157413c00148ec387447a1256980626b4e91.tar.gz
openshift-7459157413c00148ec387447a1256980626b4e91.tar.bz2
openshift-7459157413c00148ec387447a1256980626b4e91.tar.xz
openshift-7459157413c00148ec387447a1256980626b4e91.zip
Make s3_volume_mount available to set_fact call
7cf5cc14 cleaned up how the registry was being created. However the s3 cloudfront calls ended up setting and using a fact in the same block. This change makes s3_volume_mount available to the set_fact.
-rw-r--r--roles/openshift_hosted/tasks/registry/storage/s3.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/storage/s3.yml b/roles/openshift_hosted/tasks/registry/storage/s3.yml
index 69b91be0b..26f921f15 100644
--- a/roles/openshift_hosted/tasks/registry/storage/s3.yml
+++ b/roles/openshift_hosted/tasks/registry/storage/s3.yml
@@ -36,13 +36,14 @@
- path: cloudfront.pem
data: "{{ lookup('file', openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile) }}"
- - name: Add cloudfront secret to the registry volumes
+ - name: Append cloudfront secret registry volume to openshift_hosted_registry_volumes
set_fact:
+ openshift_hosted_registry_volumes: "{{ openshift_hosted_registry_volumes | union(s3_volume_mount) }}"
+ vars:
s3_volume_mount:
- name: cloudfront-vol
path: /etc/origin
type: secret
secret_name: docker-registry-s3-cloudfront
- openshift_hosted_registry_volumes: "{{ openshift_hosted_registry_volumes | union(s3_volume_mount) }}"
when: openshift_hosted_registry_storage_s3_cloudfront_baseurl | default(none) is not none