summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 03:57:56 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 03:57:57 +0000
commitf32de519adb072ee5ca38b01044f983ac4437444 (patch)
tree0876385e8a25e2b4643baa4319cc79049bcb4293 /environments
parent4ef338574b1a7cef8b1b884d439556b24fb09718 (diff)
parent29e04f6dde2ba04edb1861262694fe60fc794362 (diff)
Merge "Drop extraconfig for neutron-nuage.yaml"
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-nuage-config.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 59f6d34e..28056b35 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,7 +1,6 @@
# A Heat environment file which can be used to enable a
# a Neutron Nuage backend on the controller, configured via puppet
resource_registry:
- OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None