Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: 951ba92)
Merge "add lbaasv2 to NeutronServicePlugins in octavia containers"
authorJenkins <jenkins@review.openstack.org>
Sat, 29 Jul 2017 00:59:17 +0000 (00:59 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 29 Jul 2017 00:59:17 +0000 (00:59 +0000)
environments/services-docker/octavia.yaml patch | blob | history

diff --git a/environments/services-docker/octavia.yaml b/environments/services-docker/octavia.yaml
index b677a4f..f0c671f 100644 (file)
--- a/environments/services-docker/octavia.yaml
+++ b/environments/services-docker/octavia.yaml
@@ -3,3 +3,8 @@ resource_registry:
   OS::TripleO::Services::OctaviaHousekeeping: ../../docker/services/octavia-housekeeping.yaml
   OS::TripleO::Services::OctaviaHealthManager: ../../docker/services/octavia-health-manager.yaml
   OS::TripleO::Services::OctaviaWorker: ../../docker/services/octavia-worker.yaml
+
+parameter_defaults:
+    NeutronServicePlugins: "qos,router,trunk,lbaasv2"
+    NeutronEnableForceMetadata: true
+