Merge "Controller: Drive os-net-config via software conf"

openstack-archive · Jan 8, 2015 · e38535b · e38535b
2 parents b991d59 + 84bdcb2
commit e38535b
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/controller.yaml b/controller.yaml
@@ -376,6 +376,19 @@ resources:
         - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
 
+  NetworkConfig:
+    type: OS::TripleO::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      signal_transport: NO_SIGNAL
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: Controller}
+      input_values:
+        bridge_name: br-ex
+        interface_name: {get_param: NeutronPublicInterface}
+
   ControllerConfig:
     type: OS::TripleO::Controller::SoftwareConfig
     properties: