From 4c7d8732ca960f131fa595a5d811de44c63d5bff Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Sat, 9 Jan 2016 12:21:15 -0500 Subject: [PATCH] Add network ExtraConfig hook Adds a post-network hook to execute some tasks before nodes deployment. This hook is execute one time (not for each node) during network step. It can be useful to execute scripts or templates before creating nodes. For example, we can use this hook for : - Deploy stuff used during the deployment of nodes. - Deploying network, backup, monitoring infrastructure. Change-Id: I3e999d73b55c5c27f70f722ec63ec8f2150bb5aa --- network/extraconfig.yaml | 3 +++ network/networks.yaml | 3 +++ overcloud-resource-registry-puppet.yaml | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 network/extraconfig.yaml diff --git a/network/extraconfig.yaml b/network/extraconfig.yaml new file mode 100644 index 0000000000..93c6609f40 --- /dev/null +++ b/network/extraconfig.yaml @@ -0,0 +1,3 @@ +heat_template_version: 2015-04-30 + +description: Noop network extra config diff --git a/network/networks.yaml b/network/networks.yaml index ab50ae1188..d3ae482b94 100644 --- a/network/networks.yaml +++ b/network/networks.yaml @@ -21,3 +21,6 @@ resources: ManagementNetwork: type: OS::TripleO::Network::Management + + NetworkExtraConfig: + type: OS::TripleO::Network::ExtraConfig diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 888a3c89cd..db28393c92 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -63,6 +63,8 @@ resource_registry: OS::TripleO::Network::Tenant: network/noop.yaml OS::TripleO::Network::Management: network/noop.yaml + OS::TripleO::Network::ExtraConfig: network/extraconfig.yaml + OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.yaml OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml OS::TripleO::Network::Ports::NetIpSubnetMap: network/ports/net_ip_subnet_map.yaml