diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-24 19:14:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-24 19:14:29 +0000 |
| commit | 749d24ec9d6d6c3d0198a287bd7adebca263d7b3 (patch) | |
| tree | d1f9b133d9e44ca1ff74f756bbc66355c21729f3 | |
| parent | c93ba28a895a24c8cf14e6475a367152b35f35c4 (diff) | |
| parent | 4c7d8732ca960f131fa595a5d811de44c63d5bff (diff) | |
Merge "Add network ExtraConfig hook"
| -rw-r--r-- | network/extraconfig.yaml | 3 | ||||
| -rw-r--r-- | network/networks.yaml | 3 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 |
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 e1d95728..13d8e13d 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -63,6 +63,8 @@ resource_registry: OS::TripleO::Network::Tenant: OS::Heat::None OS::TripleO::Network::Management: OS::Heat::None + 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::NetIpListMap: network/ports/net_ip_list_map.yaml |