From f5ba55bd84e672f2c381435018e733070405ea70 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Fri, 28 Sep 2018 18:12:12 +0200 Subject: [PATCH] Remove artificial constrains around notification drivers According to https://docs.openstack.org/newton/config-reference/config-format.html we can have a list of notification drivers like: driver = messaging driver = log Let's not impose extra limitation in THT as folks might want special notifications setups. Change-Id: I873574944af237e1ff998f0e9b9b261c53c46f54 Closes-Bug: #1795026 --- puppet/services/aodh-base.yaml | 2 -- puppet/services/barbican-api.yaml | 2 -- puppet/services/ceilometer-base.yaml | 2 -- puppet/services/cinder-api.yaml | 2 -- puppet/services/congress.yaml | 2 -- puppet/services/designate-base.yaml | 2 -- puppet/services/glance-api.yaml | 2 -- puppet/services/heat-base.yaml | 2 -- puppet/services/keystone.yaml | 2 -- puppet/services/manila-base.yaml | 2 -- puppet/services/mistral-base.yaml | 2 -- puppet/services/neutron-base.yaml | 2 -- puppet/services/nova-base.yaml | 2 -- puppet/services/octavia-base.yaml | 2 -- puppet/services/sahara-base.yaml | 2 -- puppet/services/tacker.yaml | 2 -- 16 files changed, 32 deletions(-) diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 2d6d40c625..1f4771fac2 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -56,8 +56,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index fc51144f02..967293142a 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -65,8 +65,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 093cbfb426..c5e179c584 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -92,8 +92,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] GnocchiArchivePolicy: default: 'ceilometer-low-rate' type: string diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 98ce7b4820..6050723d89 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -72,8 +72,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] conditions: cinder_workers_zero: {equals : [{get_param: CinderWorkers}, 0]} diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index 682e8dee63..8531daed14 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -58,8 +58,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/designate-base.yaml b/puppet/services/designate-base.yaml index 69a22844d7..13ba64fcd1 100644 --- a/puppet/services/designate-base.yaml +++ b/puppet/services/designate-base.yaml @@ -66,8 +66,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] conditions: service_debug_unset: {equals : [{get_param: DesignateDebug}, '']} diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 97fed4bcb3..2c3e00a45e 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -166,8 +166,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 15b96552c8..58ded06d08 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -107,8 +107,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] HeatCorsAllowedOrigin: type: string default: '' diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index a5dd283e81..ace2487b74 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -222,8 +222,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] KeystoneChangePasswordUponFirstUse: type: string default: '' diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index 804c5ad26c..c0a680d389 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -52,8 +52,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index bfe802ff6a..face6dfd0c 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -53,8 +53,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index ebb5822ed9..f55fc98f43 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -93,8 +93,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] EnableInternalTLS: type: boolean default: false diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index e716d7c2a2..a872a236b3 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -38,8 +38,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] NovaPassword: description: The password for the nova service and db account type: string diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml index a5c2775b66..c619cf996d 100644 --- a/puppet/services/octavia-base.yaml +++ b/puppet/services/octavia-base.yaml @@ -68,8 +68,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] OctaviaUserName: description: The username for the Octavia database and keystone accounts. type: string diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index cc7191c2a7..0930ff44ea 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -52,8 +52,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index f4f5b48989..36a34032a5 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -58,8 +58,6 @@ parameters: type: string default: 'messagingv2' description: Driver or drivers to handle sending notifications. - constraints: - - allowed_values: [ 'messagingv2', 'noop' ] RpcPort: default: 5672 description: The network port for messaging backend