Merge "Removing WARNING: line has more than 140 characters in puppet-tripleo profiles"

6 files changed, 34 insertions, 7 deletions

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 075433b..b2cc264 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -886,7 +886,12 @@ class tripleo::haproxy (
       options          => {
         'balance'   => 'first',
         'option'    => ['tcp-check',],
-        'tcp-check' => union($redis_tcp_check_options, ['send PING\r\n','expect string +PONG','send info\ replication\r\n','expect string role:master','send QUIT\r\n','expect string +OK']),
+        'tcp-check' => union($redis_tcp_check_options, ['send PING\r\n',
+                                                        'expect string +PONG',
+                                                        'send info\ replication\r\n',
+                                                        'expect string role:master',
+                                                        'send QUIT\r\n',
+                                                        'expect string +OK']),
       },
       collect_exported => false,
     }
diff --git a/manifests/haproxy/endpoint.pp b/manifests/haproxy/endpoint.pp
index ac6cb6c..b7403a4 100644
--- a/manifests/haproxy/endpoint.pp
+++ b/manifests/haproxy/endpoint.pp
@@ -88,7 +88,8 @@ define tripleo::haproxy::endpoint (
     # service exposed to the public network
 
     if $public_certificate {
-      $public_bind_opts = list_to_hash(suffix(any2array($public_virtual_ip), ":${public_ssl_port}"), union($haproxy_listen_bind_param, ['ssl', 'crt', $public_certificate]))
+      $public_bind_opts = list_to_hash(suffix(any2array($public_virtual_ip), ":${public_ssl_port}"),
+                                        union($haproxy_listen_bind_param, ['ssl', 'crt', $public_certificate]))
     } else {
       $public_bind_opts = list_to_hash(suffix(any2array($public_virtual_ip), ":${service_port}"), $haproxy_listen_bind_param)
     }
@@ -98,7 +99,8 @@ define tripleo::haproxy::endpoint (
   }
 
   if $internal_certificate {
-    $internal_bind_opts = list_to_hash(suffix(any2array($internal_ip), ":${service_port}"), union($haproxy_listen_bind_param, ['ssl', 'crt', $public_certificate]))
+    $internal_bind_opts = list_to_hash(suffix(any2array($internal_ip), ":${service_port}"),
+                                        union($haproxy_listen_bind_param, ['ssl', 'crt', $public_certificate]))
   } else {
     $internal_bind_opts = list_to_hash(suffix(any2array($internal_ip), ":${service_port}"), $haproxy_listen_bind_param)
   }
diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp
index 0830307..eaaaefc 100644
--- a/manifests/profile/base/ceilometer/expirer.pp
+++ b/manifests/profile/base/ceilometer/expirer.pp
@@ -30,7 +30,8 @@ class tripleo::profile::base::ceilometer::expirer (
 
   if $step >= 4 {
     include ::ceilometer::expirer
-    Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
+    Cron <| title == 'ceilometer-expirer' |>
+      { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index dfb034f..7d562ec 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -108,7 +108,13 @@ class tripleo::profile::base::cinder::volume (
       $cinder_rbd_backend_name = undef
     }
 
-    $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend_name, $cinder_rbd_backend_name, $cinder_eqlx_backend_name, $cinder_dellsc_backend_name, $cinder_netapp_backend_name, $cinder_nfs_backend_name, $cinder_user_enabled_backends])
+    $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend_name,
+                                                    $cinder_rbd_backend_name,
+                                                    $cinder_eqlx_backend_name,
+                                                    $cinder_dellsc_backend_name,
+                                                    $cinder_netapp_backend_name,
+                                                    $cinder_nfs_backend_name,
+                                                    $cinder_user_enabled_backends])
     class { '::cinder::backends' :
       enabled_backends => $cinder_enabled_backends,
     }
diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp
index 2ed6752..301ac9a 100644
--- a/manifests/profile/base/snmp.pp
+++ b/manifests/profile/base/snmp.pp
@@ -43,7 +43,16 @@ class tripleo::profile::base::snmp (
     }
     class { '::snmp':
       agentaddress => ['udp:161','udp6:[::1]:161'],
-      snmpd_config => [ join(['createUser ', $snmpd_user, ' MD5 "', $snmpd_password, '"']), join(['rouser ', $snmpd_user]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
+      snmpd_config => [ join(['createUser ', $snmpd_user, ' MD5 "', $snmpd_password, '"']),
+                        join(['rouser ', $snmpd_user]),
+                        'proc  cron',
+                        'includeAllDisks  10%',
+                        'master agentx',
+                        'trapsink localhost public',
+                        'iquerySecName internalUser',
+                        'rouser internalUser',
+                        'defaultMonitors yes',
+                        'linkUpDownNotifications yes' ],
     }
   }
 }
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 31d7d80..fceb415 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -150,8 +150,12 @@ MYSQL_HOST=localhost\n",
     # with proper credentials. This step happens on every node because this sql
     # statement does not automatically replicate across nodes.
     $mysql_root_password = hiera('mysql::server::root_password')
+    $galera_set_pwd = "/bin/touch /root/.my.cnf && \
+                      /bin/echo \"UPDATE mysql.user SET Password = PASSWORD('${mysql_root_password}') WHERE user = 'root'; \
+                      flush privileges;\" | \
+                      /bin/mysql --defaults-extra-file=/root/.my.cnf -u root"
     exec { 'galera-set-root-password':
-      command => "/bin/touch /root/.my.cnf && /bin/echo \"UPDATE mysql.user SET Password = PASSWORD('${mysql_root_password}') WHERE user = 'root'; flush privileges;\" | /bin/mysql --defaults-extra-file=/root/.my.cnf -u root",
+      command => $galera_set_pwd,
     }
     file { '/root/.my.cnf' :
       ensure  => file,