瀏覽代碼

Add serviceNetworkCIDR to network config

Required by OSE 3.0.2 and Origin 1.0.6
Scott Dodson 9 年之前
父節點
當前提交
32578c30f3
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      roles/openshift_master/templates/master.yaml.v1.j2

+ 2 - 0
roles/openshift_master/templates/master.yaml.v1.j2

@@ -88,6 +88,8 @@ networkConfig:
   clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }}
   hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
   networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
+# serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet
+  serviceNetworkCIDR: {{ openshift.master.portal_net }}
 {% include 'v1_partials/oauthConfig.j2' %}
 policyConfig:
   bootstrapPolicyFile: {{ openshift_master_policy }}