summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Blanc <pblanc@redhat.com>2016-01-09 12:21:15 -0500
committerPierre Blanc <pblanc@redhat.com>2016-04-06 09:44:10 -0400
commit4c7d8732ca960f131fa595a5d811de44c63d5bff (patch)
treeaa67d0a58a3d138f5d835830b01f699c4e00e69a
parent31b05b17bfd028d16990231079c4bfde777cde40 (diff)
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
-rw-r--r--network/extraconfig.yaml3
-rw-r--r--network/networks.yaml3
-rw-r--r--overcloud-resource-registry-puppet.yaml2
3 files changed, 8 insertions, 0 deletions
diff --git a/network/extraconfig.yaml b/network/extraconfig.yaml
new file mode 100644
index 00000000..93c6609f
--- /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 ab50ae11..d3ae482b 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 888a3c89..db28393c 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