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

This commit is contained in:
Jenkins 2015-01-08 14:39:31 +00:00 committed by Gerrit Code Review
commit e38535b528

View File

@ -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: