diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 07:39:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 07:39:22 -0800 |
| commit | 7ab8e67bfc62e16466e3fd211fded63f16583403 (patch) | |
| tree | 5d4d5ea3182a4ad089267010d0fc267fde5043b4 /roles/openshift_master/defaults/main.yml | |
| parent | f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6 (diff) | |
| parent | 313b15fb2668cbe6738802f913a9caa6203083b2 (diff) | |
| download | openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.gz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.bz2 openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.xz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.zip | |
Merge pull request #6515 from mgugino-upstream-stage/defacting
Automatic merge from submit-queue.
Remove some small items from openshift_facts
Remove some small items from openshift_facts that
don't need to be there.
Diffstat (limited to 'roles/openshift_master/defaults/main.yml')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index efd119299..5d292ffd0 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -7,6 +7,12 @@ openshift_master_debug_level: "{{ debug_level | default(2) }}" r_openshift_master_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_master_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" +osm_image_default_dict: + origin: 'openshift/origin' + openshift-enterprise: 'openshift3/ose' +osm_image_default: "{{ osm_image_default_dict[openshift_deployment_type] }}" +osm_image: "{{ osm_image_default }}" + system_images_registry_dict: openshift-enterprise: "registry.access.redhat.com" origin: "docker.io" |