aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-13 04:07:50 +0000
committerGerrit Code Review <review@openstack.org>2017-07-13 04:07:50 +0000
commit6e7e5d443c98a3a9fb50cbf8815b4a57165034e4 (patch)
tree05b58472054f6740e6a476e636601ef8cef32d47 /environments
parentc76feac1a9d80c545330085c9928b6ff15f58096 (diff)
parentd5145167cb13170cb2f8b928b3c920648e7ecaf0 (diff)
Merge "Allow to set Notification Driver to 'noop'"
Diffstat (limited to 'environments')
-rw-r--r--environments/disable-telemetry.yaml3
-rw-r--r--environments/neutron-ml2-bigswitch.yaml1
2 files changed, 3 insertions, 1 deletions
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml
index 6249c286..52d0d27b 100644
--- a/environments/disable-telemetry.yaml
+++ b/environments/disable-telemetry.yaml
@@ -18,3 +18,6 @@ resource_registry:
OS::TripleO::Services::AodhNotifier: OS::Heat::None
OS::TripleO::Services::AodhListener: OS::Heat::None
OS::TripleO::Services::PankoApi: OS::Heat::None
+
+parameter_defaults:
+ NotificationDriver: 'noop'
diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml
index 8a4a144c..c0ba906e 100644
--- a/environments/neutron-ml2-bigswitch.yaml
+++ b/environments/neutron-ml2-bigswitch.yaml
@@ -13,7 +13,6 @@ parameter_defaults:
NeutronBigswitchRestproxyServerAuth:
NeutronMechanismDrivers: openvswitch,bsn_ml2
NeutronServicePlugins: bsn_l3,bsn_service_plugin
- KeystoneNotificationDriver: messaging
# Optional:
# NeutronBigswitchRestproxyAutoSyncOnFailure: