openstack/puppet-tripleo
Code Issues Proposed changes

Revert "Replace hiera('service_names') by hiera('enabled_services')"

Browse Source 
This reverts commit 7970733cf1.

Depends-On: I7339b8791817bdaffa65c928d424796114efdf57
Change-Id: I380f631de03eb3baddac80661e4c7632180b1d64

Closes-Bug: #1855138
This commit is contained in:
Emilien Macchi 2019-12-04 17:07:08 +00:00
parent 7e922b0f85
commit 950caffea8
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/firewall.pp
View File

@ -151,7 +151,7 @@ class tripleo::firewall(
# dport: 999 # dport: 999
# proto: udp # proto: udp
# action: accept # action: accept
$service_names = hiera('enabled_services', []) $service_names = hiera('service_names', [])
tripleo::firewall::service_rules { $service_names: } tripleo::firewall::service_rules { $service_names: }

2
manifests/profile/base/logging/fluentd.pp
View File

@ -116,7 +116,7 @@ class tripleo::profile::base::logging::fluentd (
$fluentd_monitoring = true, $fluentd_monitoring = true,
$fluentd_monitoring_bind = '127.0.0.1', $fluentd_monitoring_bind = '127.0.0.1',
$fluentd_monitoring_port = 24220, $fluentd_monitoring_port = 24220,
$service_names = hiera('enabled_services', []), $service_names = hiera('service_names', []),
$fluentd_managed_rsyslog = false $fluentd_managed_rsyslog = false
) { ) {
if $step >= 4 { if $step >= 4 {

4
manifests/profile/base/logging/rsyslog.pp
View File

@ -25,7 +25,7 @@
# [*service_names*] # [*service_names*]
# (Optional) List of services enabled on the current role. This is used # (Optional) List of services enabled on the current role. This is used
# to obtain per-service configuration information. # to obtain per-service configuration information.
# Defaults to hiera('enabled_services', []) # Defaults to hiera('service_names', [])
# #
# [*elasticsearch*] # [*elasticsearch*]
# (Optional) Hash. Configuration for output plugin omelasticsearch. # (Optional) Hash. Configuration for output plugin omelasticsearch.
@ -47,7 +47,7 @@
# Defaults to undef # Defaults to undef
class tripleo::profile::base::logging::rsyslog ( class tripleo::profile::base::logging::rsyslog (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$service_names = hiera('enabled_services', []), $service_names = hiera('service_names', []),
$elasticsearch = undef, $elasticsearch = undef,
$elasticsearch_tls_ca_cert = undef, $elasticsearch_tls_ca_cert = undef,
$elasticsearch_tls_client_cert = undef, $elasticsearch_tls_client_cert = undef,

2
manifests/profile/base/metrics/collectd.pp
View File

@ -267,7 +267,7 @@ class tripleo::profile::base::metrics::collectd (
$amqp_interval = undef, $amqp_interval = undef,
$qdr_mode = hiera('tripleo::profile::base::metrics::qdr::router_mode', 'edge'), $qdr_mode = hiera('tripleo::profile::base::metrics::qdr::router_mode', 'edge'),
$qdr_listens_on_external = hiera('tripleo::profile::base::metrics::qdr::listen_on_external', false), $qdr_listens_on_external = hiera('tripleo::profile::base::metrics::qdr::listen_on_external', false),
$service_names = hiera('enabled_services', []), $service_names = hiera('service_names', []),
$collectd_manage_repo = false, $collectd_manage_repo = false,
$python_read_plugins = [], $python_read_plugins = [],
$enable_sensubility = false, $enable_sensubility = false,

4
manifests/profile/base/neutron/plugins/ml2.pp
View File

@ -31,7 +31,7 @@
# We may not want to configure a ml2 plugin for a role, # We may not want to configure a ml2 plugin for a role,
# in spite of the fact that it is in the drivers list. # in spite of the fact that it is in the drivers list.
# Check if the required service is enabled from the service list. # Check if the required service is enabled from the service list.
# Defaults to hiera('enabled_services') # Defaults to hiera('service_names')
# #
# [*step*] # [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates # (Optional) The current step in deployment. See tripleo-heat-templates
@ -41,7 +41,7 @@
class tripleo::profile::base::neutron::plugins::ml2 ( class tripleo::profile::base::neutron::plugins::ml2 (
$bootstrap_node = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef), $bootstrap_node = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef),
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'), $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$service_names = hiera('enabled_services'), $service_names = hiera('service_names'),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/nova/migration/target.pp
View File

@ -36,7 +36,7 @@
# (Optional) List of services enabled on the current role. # (Optional) List of services enabled on the current role.
# If the nova_migration_target service is not enabled then migration over # If the nova_migration_target service is not enabled then migration over
# ssh will be disabled. # ssh will be disabled.
# Defaults to hiera('enabled_services', []) # Defaults to hiera('service_names', [])
# #
# [*wrapper_command*] # [*wrapper_command*]
# (Internal) Used to override the wrapper command when proxying # (Internal) Used to override the wrapper command when proxying
@ -46,7 +46,7 @@ class tripleo::profile::base::nova::migration::target (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$ssh_authorized_keys = [], $ssh_authorized_keys = [],
$ssh_localaddrs = [], $ssh_localaddrs = [],
$services_enabled = hiera('enabled_services', []), $services_enabled = hiera('service_names', []),
$wrapper_command = '/bin/nova-migration-wrapper', $wrapper_command = '/bin/nova-migration-wrapper',
) { ) {

2
spec/fixtures/hieradata/step2.yaml vendored
View File

@ -1,7 +1,7 @@
--- ---
step: 2 step: 2
# rsyslog tests # rsyslog tests
enabled_services: service_names:
- 'horizon' - 'horizon'
tripleo_logging_sources_horizon: tripleo_logging_sources_horizon:
- file: '/var/log/horizon/test.log' - file: '/var/log/horizon/test.log'

2
spec/fixtures/hieradata/step4.yaml vendored
View File

@ -11,7 +11,7 @@ cinder::backend::dellsc_iscsi::iscsi_ip_address: '127.0.0.1'
cinder::backend::eqlx::eqlx_chap_login: 'user' cinder::backend::eqlx::eqlx_chap_login: 'user'
cinder::backend::eqlx::eqlx_chap_password: 'user' cinder::backend::eqlx::eqlx_chap_password: 'user'
cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool' cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool'
enabled_services: service_names:
- 'ceilometer_agent_central' - 'ceilometer_agent_central'
- 'horizon' - 'horizon'
tripleo_fluentd_groups_ceilometer_agent_central: tripleo_fluentd_groups_ceilometer_agent_central: