diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-18 16:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 16:36:11 -0500 |
| commit | 84266ade6839f9a82e3111f12fce64b88a48845a (patch) | |
| tree | d3ba81605995f802fc32a08de13bd572f9980a8c /roles/openshift_node_group | |
| parent | b713000887c5ef1d84d376038aacd0c6966d1692 (diff) | |
| parent | 23b283e22982c032db341b7b4d81a384f0ec0b71 (diff) | |
| download | openshift-84266ade6839f9a82e3111f12fce64b88a48845a.tar.gz openshift-84266ade6839f9a82e3111f12fce64b88a48845a.tar.bz2 openshift-84266ade6839f9a82e3111f12fce64b88a48845a.tar.xz openshift-84266ade6839f9a82e3111f12fce64b88a48845a.zip | |
Merge pull request #6513 from mgugino-upstream-stage/remove-node-facts-pt2
Remove openshift_node_facts role
Diffstat (limited to 'roles/openshift_node_group')
| -rw-r--r-- | roles/openshift_node_group/defaults/main.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_node_group/defaults/main.yml b/roles/openshift_node_group/defaults/main.yml index 7c81409a5..cccdea66f 100644 --- a/roles/openshift_node_group/defaults/main.yml +++ b/roles/openshift_node_group/defaults/main.yml @@ -17,7 +17,13 @@ openshift_node_group_edits: [] openshift_node_group_namespace: openshift-node openshift_node_group_labels: [] -openshift_imageconfig_format: "{{ oreg_url if oreg_url is defined else openshift.node.registry_url }}" +openshift_oreg_url_default_dict: + origin: "openshift/origin-${component}:${version}" + openshift-enterprise: openshift3/ose-${component}:${version} +openshift_oreg_url_default: "{{ openshift_oreg_url_default_dict[openshift_deployment_type] }}" +oreg_url_node: "{{ oreg_url | default(openshift_oreg_url_default) }}" + +openshift_imageconfig_format: "{{ oreg_url_node }}" openshift_node_group_cloud_provider: "{{ openshift_cloudprovider_kind | default('aws') }}" openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}" openshift_node_group_network_plugin: "{{ openshift_node_group_network_plugin_default }}" |