diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-02-05 15:04:26 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-19 16:43:48 -0400 |
| commit | 7c11c212a270ea4da9094ed3156db91090b8c851 (patch) | |
| tree | b2f2132c4dbf5e61577af2e75144390c7e5351ea /roles/openshift_master | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| download | openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.gz openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.bz2 openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.xz openshift-7c11c212a270ea4da9094ed3156db91090b8c851.zip | |
Promote portal_net to openshift.common, add kube_svc_ip
Conflicts:
roles/openshift_facts/library/openshift_facts.py
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 1009aa318..979b428bf 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -123,7 +123,7 @@ kubernetesMasterConfig: keyFile: master.proxy-client.key schedulerConfigFile: {{ openshift_master_scheduler_conf }} servicesNodePortRange: "" - servicesSubnet: {{ openshift.master.portal_net }} + servicesSubnet: {{ openshift.common.portal_net }} staticNodeNames: {{ openshift_node_ips | default([], true) }} {% endif %} masterClients: @@ -138,7 +138,7 @@ networkConfig: networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet - serviceNetworkCIDR: {{ openshift.master.portal_net }} + serviceNetworkCIDR: {{ openshift.common.portal_net }} oauthConfig: {% if 'oauth_always_show_provider_selection' in openshift.master %} alwaysShowProviderSelection: {{ openshift.master.oauth_always_show_provider_selection }} |