diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-20 12:45:10 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-20 12:45:10 -0400 |
| commit | ef04e6ee30beef7e4e195b95374a65f4485c6ce6 (patch) | |
| tree | 3ed72dffd6786885ebf63ba24bf4722b7c7faab8 | |
| parent | 96d45a6b6115338c467baebaba837847a05508dd (diff) | |
| parent | bced0615a4edf4f2a42073a365dc756009ccc250 (diff) | |
| download | openshift-ef04e6ee30beef7e4e195b95374a65f4485c6ce6.tar.gz openshift-ef04e6ee30beef7e4e195b95374a65f4485c6ce6.tar.bz2 openshift-ef04e6ee30beef7e4e195b95374a65f4485c6ce6.tar.xz openshift-ef04e6ee30beef7e4e195b95374a65f4485c6ce6.zip | |
Merge pull request #712 from abutcher/fix-yaml
Fix yaml indentation from use_openshift_sdn conditional
| -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 cc1dee13d..6e45eaad7 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -87,9 +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 %} +{% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} - {% endif %} +{% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet serviceNetworkCIDR: {{ openshift.master.portal_net }} {% include 'v1_partials/oauthConfig.j2' %} |