Merge pull request #359 from sdodson/fix_msgserver

Use msgserver_fqdn and fix mcollective_cluster_members deprecation

Author: sdodson

README.asciidoc

@@ -445,8 +445,8 @@ msgserver_cluster is set to true.
 Default: undef
 
 === mcollective_cluster_members
-An array of ActiveMQ server hostnames.  Required when parameter
-msgserver_cluster is set to true.
+DEPRECATED: use msgserver_cluster_members instead, if both are set they must
+match
 
 Default: $msgserver_cluster_members
 

manifests/init.pp

@@ -293,8 +293,8 @@
 #
 # [*mcollective_cluster_members*]
 #   Default: $msgserver_cluster_members
-#   An array of ActiveMQ server hostnames.  Required when parameter
-#   msgserver_cluster is set to true.
+# DEPRECATED: use msgserver_cluster_members instead, if both are set they must
+# match
 #
 # [*msgserver_password*]
 #   Default 'changeme'
@@ -984,23 +984,30 @@
     default => $install_cartridges_recommended_deps,
   }
 
-  # Check for various unsupported OSE configs
-  if $ose_version != undef {
-    class { 'openshift_origin::ose_supported_config': }
-  }
-
-  if $msgserver_cluster_members and $mcollective_cluster_members == undef {
-    $real_mcollective_cluster_members = $msgserver_cluster_members
-  }
-
-  if $msgserver_cluster and ! $msgserver_cluster_members and ! $real_mcollective_cluster_members {
-    fail('msgserver_cluster_members and mcollective_cluster_members parameters are required when msgserver_cluster is set')
+  # somewhere along the way we've transitioned to msgserver_cluster_members
+  # rather than mcollective_cluster_members
+  if $msgserver_cluster {
+    if ( ($msgserver_cluster_members != $mcollective_cluster_members) and $mcollective_cluster_members ) {
+      fail('msgserver_cluster_members and mcollective_cluster_members must be the same')
+    } elsif !$msgserver_cluster_members and !$mcollective_cluster_members {
+      fail('msgserver_cluster_members is required required when msgserver_cluster is set')
+    } elsif !$msgserver_cluster_members and $mcollective_cluster_members {
+      $real_msgserver_cluster_members = $mcollective_cluster_members
+    } else {
+      $real_msgserver_cluster_members = $msgserver_cluster_members
+    }
   }
 
   Exec { path => '/usr/bin:/usr/sbin:/bin:/sbin' }
 
   include openshift_origin::update_conf_files
 
+  # Check for various unsupported OSE configs
+  if $ose_version != undef {
+    class { 'openshift_origin::ose_supported_config': }
+  }
+
+
   if member( $roles, 'nameserver' ) {
     class { 'openshift_origin::role::nameserver': } ->
     Class['openshift_origin::update_conf_files']

manifests/mcollective_client.pp

@@ -23,7 +23,7 @@
 
   # TODO: Replace with MCollective puppet module call
 
-  $cluster_members = $::openshift_origin::real_mcollective_cluster_members
+  $cluster_members = $::openshift_origin::real_msgserver_cluster_members
 
   if $cluster_members {
     $pool_size = size($cluster_members)

manifests/mcollective_server.pp

@@ -21,7 +21,7 @@
     require => Class['openshift_origin::install_method'],
   }
 
-  $cluster_members = $::openshift_origin::real_mcollective_cluster_members
+  $cluster_members = $::openshift_origin::real_msgserver_cluster_members
 
   if $cluster_members {
     $pool_size = size($cluster_members)

manifests/msgserver.pp

@@ -20,7 +20,7 @@
   class { 'openshift_origin::firewall::activemq': } ->
   anchor { 'openshift_origin::msgserver_end': }
 
-  $cluster_members        = $::openshift_origin::msgserver_cluster_members
+  $cluster_members        = $::openshift_origin::real_msgserver_cluster_members
   $cluster_remote_members = delete($cluster_members, $::openshift_origin::msgserver_fqdn)
 
   package { ['activemq','activemq-client']:

manifests/ose_supported_config.pp

@@ -59,7 +59,7 @@
     }
   }
   if $openshift_origin::msgserver_cluster {
-    if !(size($openshift_origin::msgserver_cluster_members) >= 2) {
+    if !(size($openshift_origin::real_msgserver_cluster_members) >= 2) {
         if $openshift_origin::ose_unsupported {
           notice('Openshift Enterprise requires at least 2 ActiveMQ nodes for clustered messaging')
         } else {

templates/mcollective/mcollective-client.cfg.erb

@@ -32,7 +32,7 @@ plugin.activemq.pool.<%= index + 1%>.password = <%= scope.lookupvar('::openshift
 <% end -%>
 
 <% else -%>
-plugin.activemq.pool.1.host = <%= scope.lookupvar('::openshift_origin::msgserver_hostname') %>
+plugin.activemq.pool.1.host = <%= scope.lookupvar('::openshift_origin::msgserver_fqdn') %>
 plugin.activemq.pool.1.user = <%= scope.lookupvar('::openshift_origin::mcollective_user') %>
 plugin.activemq.pool.1.password = <%= scope.lookupvar('::openshift_origin::mcollective_password') %>
 

templates/mcollective/mcollective-server.cfg.erb

@@ -33,7 +33,7 @@ plugin.activemq.pool.<%= index + 1%>.password = <%= scope.lookupvar('::openshift
 
 <% end -%>
 <% else -%>
-plugin.activemq.pool.1.host = <%= scope.lookupvar('::openshift_origin::msgserver_hostname') %>
+plugin.activemq.pool.1.host = <%= scope.lookupvar('::openshift_origin::msgserver_fqdn') %>
 plugin.activemq.pool.1.user = <%= scope.lookupvar('::openshift_origin::mcollective_user') %>
 plugin.activemq.pool.1.password = <%= scope.lookupvar('::openshift_origin::mcollective_password') %>