summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-29 00:59:17 +0000
committerGerrit Code Review <review@openstack.org>2017-07-29 00:59:17 +0000
commit599c6740eb4c81a5fcd2e99d37b831efc6d3ad7e (patch)
tree2b928dd6ca9c08bc3ef6695bad8439ce34be4261
parent951ba92f55f184fd342bc5e7af11113c6b3b10b6 (diff)
parent24a8eaa2e8322d3e867cebd5e9279cf5d8dc0b4e (diff)
Merge "add lbaasv2 to NeutronServicePlugins in octavia containers"
-rw-r--r--environments/services-docker/octavia.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/environments/services-docker/octavia.yaml b/environments/services-docker/octavia.yaml
index b677a4f6..f0c671f6 100644
--- 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
+