diff options
| author | Marek Mahut <mmahut@redhat.com> | 2015-10-20 13:34:46 +0200 |
|---|---|---|
| committer | Marek Mahut <mmahut@redhat.com> | 2015-10-20 13:34:46 +0200 |
| commit | 25354bb8f15efb829174ad53d56a31ff2fc95be9 (patch) | |
| tree | 24e810676e6a65b2c7bf1a3f4e8425ff51d724e0 /roles | |
| parent | ebbf308703f3061f7c57fedf281e610b4ea4fdf4 (diff) | |
| parent | 2b465af8ecc2ab2da13d60707e3383f809ea9924 (diff) | |
| download | openshift-25354bb8f15efb829174ad53d56a31ff2fc95be9.tar.gz openshift-25354bb8f15efb829174ad53d56a31ff2fc95be9.tar.bz2 openshift-25354bb8f15efb829174ad53d56a31ff2fc95be9.tar.xz openshift-25354bb8f15efb829174ad53d56a31ff2fc95be9.zip | |
Merge pull request #664 from tomassedovic/disable-network-plugin
Allow disabling the network plugin configuration
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 500690523..cc1dee13d 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -87,7 +87,9 @@ masterPublicURL: {{ openshift.master.public_api_url }} networkConfig: clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }} hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }} + {% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} + {% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet serviceNetworkCIDR: {{ openshift.master.portal_net }} {% include 'v1_partials/oauthConfig.j2' %} diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 946c0b655..4931d127e 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -12,12 +12,16 @@ kind: NodeConfig kubeletArguments: {{ openshift.node.kubelet_args | to_json }} {% endif %} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig +{% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} +{% endif %} # networkConfig struct introduced in origin 1.0.6 and OSE 3.0.2 which # deprecates networkPluginName above. The two should match. networkConfig: mtu: {{ openshift.node.sdn_mtu }} +{% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} +{% endif %} nodeName: {{ openshift.common.hostname | lower }} podManifestConfig: servingInfo: |