aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-17 08:07:53 +0000
committerGerrit Code Review <review@openstack.org>2016-11-17 08:07:53 +0000
commitb8dfe7fb4b588d39634cbf36a6ffaf6516a12ee0 (patch)
tree732d11d20ec181839ff7f2d26a1351ea78037b16 /manifests/profile
parenta63f799dbfb1a6cabb1ec18d929fa682fbf30289 (diff)
parent2e6a0ddf533a12fcde2fb4af397632dd2c8f0acc (diff)
Merge "Sort parameters in keystone profile alphabetically"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/keystone.pp40
1 files changed, 20 insertions, 20 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 699e3c0..1519a02 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -51,6 +51,22 @@
# creates the certificates.
# Defaults to hiera('generate_service_certificate', false).
#
+# [*heat_admin_domain*]
+# domain name for heat admin
+# Defaults to undef
+#
+# [*heat_admin_email*]
+# heat admin email address
+# Defaults to undef
+#
+# [*heat_admin_password*]
+# heat admin password
+# Defaults to undef
+#
+# [*heat_admin_user*]
+# heat admin user name
+# Defaults to undef
+#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
@@ -74,37 +90,21 @@
# for more details.
# Defaults to hiera('step')
#
-# [*heat_admin_domain*]
-# domain name for heat admin
-# Defaults to undef
-#
-# [*heat_admin_user*]
-# heat admin user name
-# Defaults to undef
-#
-# [*heat_admin_email*]
-# heat admin email address
-# Defaults to undef
-#
-# [*heat_admin_password*]
-# heat admin password
-# Defaults to undef
-#
class tripleo::profile::base::keystone (
$admin_endpoint_network = hiera('keystone_admin_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$generate_service_certificates = hiera('generate_service_certificates', false),
+ $heat_admin_domain = undef,
+ $heat_admin_email = undef,
+ $heat_admin_password = undef,
+ $heat_admin_user = undef,
$manage_db_purge = hiera('keystone_enable_db_purge', true),
$public_endpoint_network = hiera('keystone_public_api_network', undef),
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
$rabbit_port = hiera('keystone::rabbit_port', 5672),
$step = hiera('step'),
- $heat_admin_domain = undef,
- $heat_admin_user = undef,
- $heat_admin_email = undef,
- $heat_admin_password = undef,
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true