aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/cinder/volume/dellps.pp1
-rw-r--r--manifests/profile/pacemaker/database/mysql_bundle.pp4
-rw-r--r--manifests/profile/pacemaker/database/redis_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/rabbitmq_bundle.pp4
4 files changed, 6 insertions, 5 deletions
diff --git a/manifests/profile/base/cinder/volume/dellps.pp b/manifests/profile/base/cinder/volume/dellps.pp
index e81a7e8..69911cd 100644
--- a/manifests/profile/base/cinder/volume/dellps.pp
+++ b/manifests/profile/base/cinder/volume/dellps.pp
@@ -38,6 +38,7 @@ class tripleo::profile::base::cinder::volume::dellps (
san_ip => hiera('cinder::backend::eqlx::san_ip', undef),
san_login => hiera('cinder::backend::eqlx::san_login', undef),
san_password => hiera('cinder::backend::eqlx::san_password', undef),
+ san_private_key => hiera('cinder::backend::eqlx::san_private_key', undef),
san_thin_provision => hiera('cinder::backend::eqlx::san_thin_provision', undef),
eqlx_group_name => hiera('cinder::backend::eqlx::eqlx_group_name', undef),
eqlx_pool => hiera('cinder::backend::eqlx::eqlx_pool', undef),
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index a80b2de..21d671c 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -20,11 +20,11 @@
#
# [*mysql_docker_image*]
# (Optional) The docker image to use for creating the pacemaker bundle
-# Defaults to hiera('tripleo::profile::pacemaker::database::redis_bundle::mysql_docker_image', undef)
+# Defaults to hiera('tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image', undef)
#
# [*control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3123')
+# Defaults to hiera('tripleo::profile::pacemaker::database::mysql_bundle::control_port', '3123')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index ea153a8..8b18858 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -24,7 +24,7 @@
#
# [*redis_docker_control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::redis_bundle::control_port', '3121')
+# Defaults to hiera('tripleo::profile::pacemaker::redis_bundle::control_port', '3124')
#
# [*pcs_tries*]
# (Optional) The number of times pcs commands should be retried.
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 2f848b4..5dd22d2 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -24,7 +24,7 @@
#
# [*rabbitmq_docker_control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3121')
+# Defaults to hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
@@ -55,7 +55,7 @@
#
class tripleo::profile::pacemaker::rabbitmq_bundle (
$rabbitmq_docker_image = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image', undef),
- $rabbitmq_docker_control_port = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3121'),
+ $rabbitmq_docker_control_port = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122'),
$bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name'),
$erlang_cookie = hiera('rabbitmq::erlang_cookie'),
$user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),