summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/templates
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-26 09:29:53 -0700
committerGitHub <noreply@github.com>2017-09-26 09:29:53 -0700
commit8c6192e10192b75af79b82e5e9f21cdc560a6e14 (patch)
tree52cea806c342cd9a06d8628acf6eaf1595eb9f12 /roles/openshift_hosted/templates
parent4ac743b8fd26e02af6e230af2cbbe82dd2d4617a (diff)
parent82d61ae9e23c2ae1f722ed3b458a6e39721e71fd (diff)
downloadopenshift-8c6192e10192b75af79b82e5e9f21cdc560a6e14.tar.gz
openshift-8c6192e10192b75af79b82e5e9f21cdc560a6e14.tar.bz2
openshift-8c6192e10192b75af79b82e5e9f21cdc560a6e14.tar.xz
openshift-8c6192e10192b75af79b82e5e9f21cdc560a6e14.zip
Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2
Automatic merge from submit-queue Refactor openshift_hosted plays and role (version 2) Currently, openshift_hosted role duplicates some logic across separate task chains. This commit cleans up the openshift_hosted role and converts it to be primarily used with include_role to give better logic to the playbooks that utilize this role. This commit also refactors the playbook that calls various openshift_hosted roles into individual playbooks. This allows more granularity for advanced users. ----- This version of the patch set rolls back some of the refactoring (removal of running fact roles as a dependency) and focuses on just realigning the roles and plays. Original PR: https://github.com/openshift/openshift-ansible/pull/5284 Once this merges, I will close the old PR. Leaving it open for now for reference.
Diffstat (limited to 'roles/openshift_hosted/templates')
-rw-r--r--roles/openshift_hosted/templates/registry_config.j24
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index 61da452de..eae8b328e 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -70,10 +70,8 @@ auth:
openshift:
realm: openshift
middleware:
-{% if openshift.common.version_gte_3_3_or_1_3 | bool %}
registry:
- name: openshift
-{% endif %}
repository:
- name: openshift
options:
@@ -87,7 +85,7 @@ middleware:
baseurl: {{ openshift_hosted_registry_storage_s3_cloudfront_baseurl }}
privatekey: /etc/origin/cloudfront.pem
keypairid: {{ openshift_hosted_registry_storage_s3_cloudfront_keypairid }}
-{% elif openshift.common.version_gte_3_3_or_1_3 | bool %}
+{% else %}
storage:
- name: openshift
{% endif -%}