diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-04 19:34:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-04 19:34:27 +0000 |
commit | 4a02aeb22e8f6e27bf8c8ca84422fe9842b8738d (patch) | |
tree | aeac46e92c78c6735de248f3d57ed16f9f1893d3 /puppet/controller-role.yaml | |
parent | f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5 (diff) | |
parent | f1cc2143842e869c97aed5f777c0ec1144d0d132 (diff) |
Merge "Add pre-network hook and example showing config-then-reboot"
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index a06b7b47..9e35af5f 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -364,6 +364,11 @@ resources: - - {get_attr: [Controller, name]} - ctlplane + PreNetworkConfig: + type: OS::TripleO::Controller::PreNetworkConfig + properties: + server: {get_resource: Controller} + NetworkConfig: type: OS::TripleO::Controller::Net::SoftwareConfig properties: @@ -377,6 +382,7 @@ resources: NetworkDeployment: type: OS::TripleO::SoftwareDeployment + depends_on: PreNetworkConfig properties: name: NetworkDeployment config: {get_resource: NetworkConfig} |