Merge "Remove NeutronServicePlugins from octavia environment files"

This commit is contained in:
Zuul 2018-09-29 19:51:17 +00:00 committed by Gerrit Code Review
commit 84097b7aae
2 changed files with 0 additions and 2 deletions

View File

@ -6,7 +6,6 @@ resource_registry:
OS::TripleO::Services::OctaviaDeploymentConfig: ../../puppet/services/octavia/octavia-deployment-config.yaml OS::TripleO::Services::OctaviaDeploymentConfig: ../../puppet/services/octavia/octavia-deployment-config.yaml
parameter_defaults: parameter_defaults:
NeutronServicePlugins: "qos,router,trunk"
NeutronEnableForceMetadata: true NeutronEnableForceMetadata: true
# This flag enables internal generation of certificates for communication # This flag enables internal generation of certificates for communication

View File

@ -6,7 +6,6 @@ resource_registry:
OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
parameter_defaults: parameter_defaults:
NeutronServicePlugins: "qos,router,trunk"
NeutronEnableForceMetadata: true NeutronEnableForceMetadata: true
# This flag enables internal generation of certificates for communication # This flag enables internal generation of certificates for communication