Merge "Gnocchi: Clean up unused parameters"
This commit is contained in:
commit
f6b7adeec1
|
@ -22,18 +22,6 @@
|
||||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||||
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
|
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
|
||||||
#
|
#
|
||||||
# [*certificates_specs*]
|
|
||||||
# (Optional) The specifications to give to certmonger for the certificate(s)
|
|
||||||
# it will create.
|
|
||||||
# Example with hiera:
|
|
||||||
# apache_certificates_specs:
|
|
||||||
# httpd-internal_api:
|
|
||||||
# hostname: <overcloud controller fqdn>
|
|
||||||
# service_certificate: <service certificate path>
|
|
||||||
# service_key: <service key path>
|
|
||||||
# principal: "haproxy/<overcloud controller fqdn>"
|
|
||||||
# Defaults to hiera('apache_certificate_specs', {}).
|
|
||||||
#
|
|
||||||
# [*enable_internal_tls*]
|
# [*enable_internal_tls*]
|
||||||
# (Optional) Whether TLS in the internal network is enabled or not.
|
# (Optional) Whether TLS in the internal network is enabled or not.
|
||||||
# Defaults to hiera('enable_internal_tls', false)
|
# Defaults to hiera('enable_internal_tls', false)
|
||||||
|
@ -53,7 +41,6 @@
|
||||||
#
|
#
|
||||||
class tripleo::profile::base::gnocchi (
|
class tripleo::profile::base::gnocchi (
|
||||||
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
|
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
|
||||||
$certificates_specs = hiera('apache_certificates_specs', {}),
|
|
||||||
$enable_internal_tls = hiera('enable_internal_tls', false),
|
$enable_internal_tls = hiera('enable_internal_tls', false),
|
||||||
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
|
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
|
||||||
$redis_vip = hiera('redis_vip'),
|
$redis_vip = hiera('redis_vip'),
|
||||||
|
|
|
@ -55,14 +55,6 @@
|
||||||
# (Required) Redis ip address for the coordination url
|
# (Required) Redis ip address for the coordination url
|
||||||
# Defaults to hiera('redis_vip')
|
# Defaults to hiera('redis_vip')
|
||||||
#
|
#
|
||||||
# [*gnocchi_rbd_client_name*]
|
|
||||||
# (Optional) RBD Client username.
|
|
||||||
# Defaults to hiera('gnocchi::storage::ceph::ceph_username')
|
|
||||||
#
|
|
||||||
# [*gnocchi_rbd_ceph_conf_path*]
|
|
||||||
# (Optional) The path where the Ceph Cluster config files are stored on the host
|
|
||||||
# Defaults to '/etc/ceph'
|
|
||||||
#
|
|
||||||
# [*step*]
|
# [*step*]
|
||||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||||
# for more details.
|
# for more details.
|
||||||
|
@ -80,8 +72,6 @@ class tripleo::profile::base::gnocchi::api (
|
||||||
$gnocchi_network = hiera('gnocchi_api_network', undef),
|
$gnocchi_network = hiera('gnocchi_api_network', undef),
|
||||||
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
|
$gnocchi_redis_password = hiera('gnocchi_redis_password'),
|
||||||
$redis_vip = hiera('redis_vip'),
|
$redis_vip = hiera('redis_vip'),
|
||||||
$gnocchi_rbd_client_name = hiera('gnocchi::storage::ceph::ceph_username','openstack'),
|
|
||||||
$gnocchi_rbd_ceph_conf_path = '/etc/ceph',
|
|
||||||
$step = Integer(hiera('step')),
|
$step = Integer(hiera('step')),
|
||||||
$incoming_storage_driver = hiera('incoming_storage_driver', undef),
|
$incoming_storage_driver = hiera('incoming_storage_driver', undef),
|
||||||
) {
|
) {
|
||||||
|
|
|
@ -121,7 +121,6 @@ eos
|
||||||
:gnocchi_backend => 'rbd',
|
:gnocchi_backend => 'rbd',
|
||||||
:gnocchi_redis_password => 'gnocchi',
|
:gnocchi_redis_password => 'gnocchi',
|
||||||
:redis_vip => '127.0.0.1',
|
:redis_vip => '127.0.0.1',
|
||||||
:gnocchi_rbd_client_name => 'openstack',
|
|
||||||
:incoming_storage_driver => 'redis',
|
:incoming_storage_driver => 'redis',
|
||||||
} }
|
} }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue