openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add network ExtraConfig hook"

Browse Source
This commit is contained in:
Jenkins 2016-06-24 19:14:29 +00:00 committed by Gerrit Code Review
commit 749d24ec9d
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network/extraconfig.yaml Normal file
View File

@ -0,0 +1,3 @@
heat_template_version: 2015-04-30
description: Noop network extra config

3
network/networks.yaml
View File

@ -21,3 +21,6 @@ resources:
ManagementNetwork:
type: OS::TripleO::Network::Management
NetworkExtraConfig:
type: OS::TripleO::Network::ExtraConfig

2
overcloud-resource-registry-puppet.yaml
View File

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