Merge "Map NetworkConfig resource to net-config-noop.yaml"

environments/standalone/standalone-overcloud.yaml

@@ -42,6 +42,14 @@ parameter_defaults:
   # Type: string
   StandaloneHostnameFormat: '%stackname%-standalone-%index%'
 
+  # Standalone NetworkConfigTemplate
+  # Type: string
+  StandaloneNetworkConfigTemplate: templates/net_config_bridge.j2
+
+  # Standalone NetworkConfig with ansible flag
+  # Type: boolean
+  StandaloneNetworkConfigWithAnsible: True
+
   # How many replicas to use in the swift rings.
   # Type: number
   SwiftReplicas: 1
@@ -97,4 +105,4 @@ resource_registry:
   OS::TripleO::Services::SaharaApi: OS::Heat::None
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
   OS::TripleO::Services::Zaqar: OS::Heat::None
-  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
+  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml

environments/standalone/standalone-tripleo.yaml

@@ -54,11 +54,11 @@ parameter_defaults:
 
   # Standalone NetworkConfigTemplate
   # Type: string
-  StandaloneNetworkConfigTemplate: ''
+  StandaloneNetworkConfigTemplate: templates/standalone.j2
 
   # Standalone NetworkConfig with ansible flag
   # Type: boolean
-  StandaloneNetworkConfigWithAnsible: False
+  StandaloneNetworkConfigWithAnsible: True
 
   # How many replicas to use in the swift rings.
   # Type: number
@@ -127,4 +127,4 @@ resource_registry:
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
   OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
   OS::TripleO::Services::Zaqar: OS::Heat::None
-  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
+  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml

environments/undercloud.yaml

@@ -7,7 +7,7 @@ resource_registry:
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
-  OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
+  OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-noop.yaml
   OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
   OS::TripleO::Services::DockerRegistry: ../deployment/image-serve/image-serve-baremetal-ansible.yaml
   OS::TripleO::Services::ContainerImagePrepare: ../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml

sample-env-generator/standalone.yaml

@@ -58,15 +58,15 @@ environments:
       EnablePackageInstall: true
       SwiftReplicas: 1
       SshFirewallAllowAll: true
-      StandaloneNetworkConfigWithAnsible: false
-      StandaloneNetworkConfigTemplate: ''
+      StandaloneNetworkConfigWithAnsible: True
+      StandaloneNetworkConfigTemplate: templates/standalone.j2
 
     resource_registry:
       # this network config is assumed by the tripleo deploy command
       OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
       OS::TripleO::Network::Ports::OVNDBsVipPort: ../../network/ports/noop.yaml
       OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
-      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
+      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml
 
       # OVN
       OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -186,6 +186,8 @@ environments:
           - StandaloneHostnameFormat
           - StandaloneCount
           - OvercloudStandaloneFlavor
+          - StandaloneNetworkConfigWithAnsible
+          - StandaloneNetworkConfigTemplate
       overcloud.yaml:
         parameters:
           - DnsServers
@@ -193,8 +195,11 @@ environments:
       StandaloneCount: 1
       OvercloudStandaloneFlavor: standalone
       SwiftReplicas: 1
+      StandaloneNetworkConfigWithAnsible: True
+      StandaloneNetworkConfigTemplate: templates/net_config_bridge.j2
+
     resource_registry:
-      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
+      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml
 
       OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml