diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-22 13:19:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 13:19:09 -0500 |
| commit | f983b99d4a4acd1e3922305190dbe854227cccc0 (patch) | |
| tree | 3f467db738e30063b564112867e897e4c16012fe /roles/openshift_node/defaults | |
| parent | 5889d10321ced514a1a235016bc4173895065474 (diff) | |
| parent | f9846a94a2ebd0f9417aeb8f9007f8acdba32b24 (diff) | |
| download | openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.gz openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.bz2 openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.xz openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.zip | |
Merge pull request #6201 from mgugino-upstream-stage/system-reg
Fix system_images_registry variable
Diffstat (limited to 'roles/openshift_node/defaults')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 816338fa1..d249278dc 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -9,6 +9,12 @@ l_is_node_system_container: "{{ (openshift_use_node_system_container | default(o openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}" openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}" +system_images_registry_dict: + openshift-enterprise: "registry.access.redhat.com" + origin: "docker.io" + +system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}" + openshift_image_tag: '' default_r_openshift_node_image_prep_packages: |