diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-30 12:29:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-30 12:29:21 +0000 |
| commit | 44525fca3aa46aa0fc59e1a44afc2ed098208cc7 (patch) | |
| tree | 774be4d9d822a105c06a11a9177a2929ec8371f6 /overcloud-resource-registry-puppet.yaml | |
| parent | a47d580018625d1b6363228f4254ded317c2091e (diff) | |
| parent | da308a26be26469c53203520631c89a734e5c876 (diff) | |
Merge "Convert noop NetworkExtraConfig to OS::Heat::None"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index e4fc8a0b..e20049c2 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -63,7 +63,7 @@ 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::ExtraConfig: OS::Heat::None OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.yaml OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml |