diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-15 05:22:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-15 05:22:04 +0000 |
| commit | 4bd42ea849e6d50d16610377b5e89504f5a4f412 (patch) | |
| tree | 61c380b4b083b4e809facd15b2295a96956c94ef /environments | |
| parent | 07586ca090cf2e8257aec654709e76b3177e8572 (diff) | |
| parent | 5f21481962a1d5d41a9ef1735d24277eba6872c5 (diff) | |
Merge "Drop extraconfig for neutron-plumgrid.yaml"
Diffstat (limited to 'environments')
| -rwxr-xr-x | environments/neutron-plumgrid.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 333d44d1..08ace103 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -1,7 +1,6 @@ # A Heat environment file which can be used to enable PLUMgrid # extensions, configured via puppet resource_registry: - OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml # PLUMgrid doesn't require dhcp, l3, metadata, and ovs agents OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None |