diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-16 07:47:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-16 07:47:36 +0000 |
| commit | f521b36734bb440b43d628f9a974243677704cc6 (patch) | |
| tree | a5f4c65b1e1e3a05a965fedf0ef5a046572027b8 | |
| parent | 2f18f063568a8624dcdf965a2e33e12203797559 (diff) | |
| parent | 7678618c0b24d2089d5dc997bae8d315bba78f43 (diff) | |
Merge "Remove external bridge from Compute nodes"
| -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 6e423048..a0773d6d 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -2,7 +2,7 @@ resource_registry: OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::Compute: puppet/compute-puppet.yaml - OS::TripleO::Compute::Net::SoftwareConfig: net-config-bridge.yaml + OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment OS::TripleO::Controller: puppet/controller-puppet.yaml OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml |