diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-01-08 14:39:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-01-08 14:39:31 +0000 |
| commit | e38535b528e3a611d5fe623b3e0212b88c48395e (patch) | |
| tree | 19bc6233507f558a5fc5542bdde4357303bcf20a | |
| parent | b991d59df57712dd7e67b7f8d9bce6999bc3a13c (diff) | |
| parent | 84bdcb23d171d3511688d0f54f0bf62479544376 (diff) | |
Merge "Controller: Drive os-net-config via software conf"
| -rw-r--r-- | controller.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 581d966c..57b07718 100644 --- 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: |