summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2017-07-20 19:13:34 +0200
committerMichele Baldessari <michele@acksyn.org>2017-07-21 10:46:48 +0200
commit1da0b51ecc703d01bb362c6b6038ab2bc652ea7a (patch)
tree527dcc583f183c747e68875d8d35cae2e73c3918
parentd47c6ae05c7e22ae937d0c0e5e57ec145a692536 (diff)
Fix up the control-port for rabbitmq bundles
Mistakenly this was set to 3121 which is the same port that pacemaker remote uses. Move this to 3122 which was the plan all along. Also fix a wrong port comment in redis and mysql at the same time. Change-Id: Iccca6a53a769570443091577c7d86f47119d9cbb
-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
3 files changed, 5 insertions, 5 deletions
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),