diff options
Diffstat (limited to 'manifests/profile/base/database')
| -rw-r--r-- | manifests/profile/base/database/mongodb.pp | 5 | ||||
| -rw-r--r-- | manifests/profile/base/database/mongodbcommon.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/database/mysql.pp | 21 | ||||
| -rw-r--r-- | manifests/profile/base/database/redis.pp | 12 |
4 files changed, 22 insertions, 25 deletions
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp index 4c53c9c..1a19bb6 100644 --- a/manifests/profile/base/database/mongodb.pp +++ b/manifests/profile/base/database/mongodb.pp @@ -32,10 +32,9 @@ # class tripleo::profile::base::database::mongodb ( $mongodb_replset, - $bootstrap_node = downcase(hiera('bootstrap_nodeid')), - $step = hiera('step'), + $bootstrap_node = downcase(hiera('bootstrap_nodeid')), + $step = hiera('step'), ) { - if $step >= 2 { include ::mongodb::globals diff --git a/manifests/profile/base/database/mongodbcommon.pp b/manifests/profile/base/database/mongodbcommon.pp index 6530730..756ab85 100644 --- a/manifests/profile/base/database/mongodbcommon.pp +++ b/manifests/profile/base/database/mongodbcommon.pp @@ -18,18 +18,17 @@ # # === Parameters # -# [*mongodb_node_ips*] -# List of The mongodb node ip addresses -# # [*mongodb_ipv6_enabled*] # A boolean value for mongodb server ipv6 is enabled or not # Defaults to false # +# [*mongodb_node_ips*] +# List of The mongodb node ip addresses +# class tripleo::profile::base::database::mongodbcommon ( - $mongodb_node_ips = hiera('mongo_node_ips'), $mongodb_ipv6_enabled = false, + $mongodb_node_ips = hiera('mongo_node_ips'), ) { - $port = '27017' # NOTE(gfidente): the following vars are needed on all nodes so they diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 27df6e4..49c9df3 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -18,29 +18,30 @@ # # === Parameters # -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') +# [*manage_resources*] +# (Optional) Whether or not manage root user, root my.cnf, and service. +# Defaults to true # # [*mysql_server_options*] # (Optional) Extras options to deploy MySQL. Useful when deploying Galera cluster. # Should be an hash. # Defaults to {} # -# [*manage_resources*] -# (Optional) Whether or not manage root user, root my.cnf, and service. -# Defaults to true -# # [*remove_default_accounts*] # (Optional) Whether or not remove default MySQL accounts. # Defaults to true # +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# class tripleo::profile::base::database::mysql ( - $step = hiera('step'), - $mysql_server_options = {}, $manage_resources = true, + $mysql_server_options = {}, $remove_default_accounts = true, + $step = hiera('step'), + ) { validate_hash($mysql_server_options) diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp index 3a5200c..14f6af4 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -18,26 +18,24 @@ # # === Parameters # -# [*redis_node_ips*] -# (Optional) List of Redis node ips -# Defaults to hiera('redis_node_ips') -# # [*bootstrap_nodeid*] # (Optional) Hostname of Redis master # Defaults to hiera('bootstrap_nodeid') # +# [*redis_node_ips*] +# (Optional) List of Redis node ips +# Defaults to hiera('redis_node_ips') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # - class tripleo::profile::base::database::redis ( - $redis_node_ips = hiera('redis_node_ips'), $bootstrap_nodeid = hiera('bootstrap_nodeid'), + $redis_node_ips = hiera('redis_node_ips'), $step = hiera('step'), ) { - if $step >= 2 { if $bootstrap_nodeid == $::hostname { $slaveof = undef |