Merge "Remove NeutronServicePlugins from octavia environment files"
This commit is contained in:
commit
84097b7aae
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue