Merge pull request #8216 from JacobTanenbaum/BZ1534779

Remove clusterNetworkCIDR/hostSubnetLength from default config

roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -111,8 +111,6 @@ masterClients:
   openshiftLoopbackKubeConfig: openshift-master.kubeconfig
 masterPublicURL: {{ openshift.master.public_api_url }}
 networkConfig:
-  clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }}
-  hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
   clusterNetworks:
   - cidr: {{ openshift.master.sdn_cluster_network_cidr }}
     hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}