aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-07 03:46:24 +0000
committerGerrit Code Review <review@openstack.org>2017-10-07 03:46:24 +0000
commit4ade8417189b423c017207ae8f776d6d68c59e4b (patch)
tree5e0c847ce2db6b05508d470b5db171a5f98d43f0 /environments
parentd3d0fb6a86375debe233f654b0ea901cf0beb6eb (diff)
parentc0444b9d52b532060c1218b42353ad7309122eeb (diff)
Merge "Drop extraconfig for nova-nuage" into stable/pike
Diffstat (limited to 'environments')
-rw-r--r--environments/nova-nuage-config.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/environments/nova-nuage-config.yaml b/environments/nova-nuage-config.yaml
index 5e75ed9..e8e3aaa 100644
--- a/environments/nova-nuage-config.yaml
+++ b/environments/nova-nuage-config.yaml
@@ -1,8 +1,7 @@
# A Heat environment file which can be used to enable
# Nuage backend on the compute, configured via puppet
resource_registry:
- OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
- OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
+ OS::TripleO::Services::ComputeNeutronCorePlugin: OS::TripleO::Services::ComputeNeutronCorePluginNuage
parameter_defaults:
NuageActiveController: '0.0.0.0'