summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2014-12-19 21:35:48 -0500
committerDan Prince <dprince@redhat.com>2015-01-05 13:53:28 -0500
commit84bdcb23d171d3511688d0f54f0bf62479544376 (patch)
tree0b4b896f0e2d4b6fcbd6e0f08a7e7ee265f4de8e
parentf567ba6dea9ef6147ba9214606f9a4d434e99eb1 (diff)
Controller: Drive os-net-config via software conf
This example extends the controller software configuration so that heat metadata is used to model the os-net-config YAML (ultimately JSON) directly. The existing os-net-config element already supports this format. Configuring the physical network layer in this manner would supplant the ever growing list of Heat parameters that we have and is something that could be automatically generated via tuskar. The default is to use net-config-noop.yaml which will pass no config metadata into the os-net-config element which will essentially disable it in favor of using parameters w/ init-neutron-ovs. Change-Id: Ifba60454ee11222173a9762882e767a836a4545c
-rw-r--r--controller.yaml13
1 files changed, 13 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml
index 739b683c..77025143 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -375,6 +375,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: