Change deployed server environment for ansible nic config

This changes deployed-server-environment.j2.yaml to not use
heat SoftwareConfig resource for nic config.

Change-Id: Ic66d515444075abf61fc2b339cb54034d4505987

deployed-server/README.rst

@@ -45,13 +45,15 @@ that all connectivity is not lost in case of a configuration error. Be sure to
 use correct nic config templates as needed, since the nodes will not receive
 dhcp from the undercloud neutron-dhcp-agent service.
 
-For example, the net-config-static-bridge.yaml template could be used for
-controllers, and the net-config-static.yaml template could be used for computes
+For example, the net_config_static_bridge.j2 template could be used for
+controllers, and the net_config_static.j2 template could be used for computes
 by specifying:
 
-resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static-bridge.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static.yaml
+parameter_defaults:
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigWithAnsible: true
+  ControlleNetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
+  ComputeNetworkConfigTemplate: 'templates/net_config_static.j2'
 
 In a setup where the first nic on the servers is used for external management,
 set the nic's to be used for OpenStack to nic2:

environments/deployed-server-environment.j2.yaml

@@ -4,9 +4,12 @@ resource_registry:
   OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
 
 {% for role in roles %}
-  # Default nic config mappings
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static-bridge.yaml
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
 {% endfor %}
 
 parameter_defaults:
   EnablePackageInstall: True
+{% for role in roles %}
+  {{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
+  {{role.name}}NetworkConfigWithAnsible: true
+{% endfor %}