6 files changed, 10 insertions, 11 deletions
diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
index 6b566a7..2be9915 100644
--- a/manifests/profile/pacemaker/ceph/rbdmirror.pp
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -76,8 +76,8 @@ class tripleo::profile::pacemaker::ceph::rbdmirror (
     ceph::mirror { $client_name:
       rbd_mirror_enable => false,
       rbd_mirror_ensure => 'stopped',
-    } ->
-    pacemaker::resource::service { "ceph-rbd-mirror_${client_name}":
+    }
+    -> pacemaker::resource::service { "ceph-rbd-mirror_${client_name}":
       # NOTE(gfidente): systemd uses the @ sign but it is an invalid
       # character in a pcmk resource name, so we need to use it only
       # for the name of the service
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index 933a735..17ed95d 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -63,8 +63,7 @@ class tripleo::profile::pacemaker::cinder::backup (
 
   if $step >= 3 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
     Cinder_config<||>
-    ~>
-    tripleo::pacemaker::resource_restart_flag { "${::cinder::params::backup_service}": }
+    ~> tripleo::pacemaker::resource_restart_flag { "${::cinder::params::backup_service}": }
   }
 
   if $step >= 5 and $pacemaker_master {
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/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index 212c345..4f39a7b 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -93,7 +93,7 @@ class tripleo::profile::pacemaker::ovn_northd (
       tries        => $pcs_tries,
     }
 
-    Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"] ->
-      Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
+    Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"]
+      -> Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
   }
 }
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),