diff options
| author | Vishal Patil <vishpat@gmail.com> | 2016-01-04 16:42:25 -0500 |
|---|---|---|
| committer | Vishal Patil <vishpat@gmail.com> | 2016-01-25 13:19:13 -0500 |
| commit | 93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5 (patch) | |
| tree | a4a06f52e08aebe8c55c21002f3f2956cd178e0a /roles/openshift_master | |
| parent | 530aaf841d38c036a2d08df075f85d63b8a52840 (diff) | |
| download | openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.gz openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.bz2 openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.xz openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.zip | |
Add Nuage support to openshift ansible
Added variables
Made changes for node configuration
Add service restart logic to node
Fixed ansible syntax errors
Add cert and key info for nodes
Added active and standby controller ip configuration information
Uncommented the nuage sdn check
Changed ca_crt -> ca_cert
Added restarting of atomic openshift master
Removed service account dependencies
Fixes
Fixed the api server url
Removed redundant restart of atomic openshift master
Configure nuagekubemon on all of the master nodes
Restart master api and controllers as well on nuagekubemon installation
Converted plugin config into template
Add template for nuagekubemon
Removed uplink interface from vars
Able to copy cert keys
Uninstall default ovs
Add the kubemon template
Do not install rdo sdn rpms in case of nuage
Addressed latest review comments
Set the networkPluginName for nuage
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index cadb02fa3..2b399e77d 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -102,7 +102,7 @@ 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 %} +{% if openshift.common.use_openshift_sdn or openshift.common.use_nuage %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet |