diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ceilometer-base.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/pacemaker/manila-share.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/rabbitmq.yaml | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index b4c361a3..cdba2d3f 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -115,6 +115,10 @@ parameters: description: Driver or drivers to handle sending notifications. constraints: - allowed_values: [ 'messagingv2', 'noop' ] + GnocchiArchivePolicy: + default: 'low' + type: string + description: archive policy to use with gnocchi backend conditions: service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']} @@ -149,7 +153,7 @@ outputs: ceilometer::agent::auth::auth_endpoint_type: 'internalURL' ceilometer::dispatcher::gnocchi::url: {get_param: [EndpointMap, GnocchiInternal, uri]} ceilometer::dispatcher::gnocchi::filter_project: 'service' - ceilometer::dispatcher::gnocchi::archive_policy: 'low' + ceilometer::dispatcher::gnocchi::archive_policy: {get_param: GnocchiArchivePolicy} ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml' ceilometer::notification_driver: {get_param: NotificationDriver} ceilometer::rabbit_userid: {get_param: RabbitUserName} diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml index 61bf4580..8a282014 100644 --- a/puppet/services/pacemaker/manila-share.yaml +++ b/puppet/services/pacemaker/manila-share.yaml @@ -52,5 +52,8 @@ outputs: config_settings: map_merge: - get_attr: [ManilaShareBase, role_data, config_settings] + - manila::share::manage_service: false + manila::share::enabled: false + manila::host: hostgroup step_config: | include ::tripleo::profile::pacemaker::manila diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index 5867721a..ba3a0984 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -88,7 +88,7 @@ outputs: - 25672 rabbitmq::delete_guest_user: false rabbitmq::wipe_db_on_cookie_change: true - rabbitmq::port: '5672' + rabbitmq::port: 5672 rabbitmq::package_provider: yum rabbitmq::package_source: undef rabbitmq::repos_ensure: false @@ -122,7 +122,7 @@ outputs: rabbitmq::interface: {get_param: [ServiceNetMap, RabbitmqNetwork]} rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues} rabbitmq::ssl: {get_param: EnableInternalTLS} - rabbitmq::ssl_port: '5672' + rabbitmq::ssl_port: 5672 rabbitmq::ssl_depth: 1 rabbitmq::ssl_only: {get_param: EnableInternalTLS} rabbitmq::ssl_interface: {get_param: [ServiceNetMap, RabbitmqNetwork]} |