From 9b438a0249d59399c63c016921a9b6add8159dd2 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Thu, 20 Jul 2017 20:51:14 +0200 Subject: Fix lint issues to upgrade to puppet-lint 2.3 2017-07-20 15:09:38.571317 | manifests/glance/nfs_mount.pp:65:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571430 | manifests/pacemaker/haproxy_with_vip.pp:107:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571473 | manifests/pacemaker/haproxy_with_vip.pp:108:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571511 | manifests/pacemaker/haproxy_with_vip.pp:109:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571551 | manifests/pacemaker/resource_restart_flag.pp:44:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571590 | manifests/profile/base/cinder/volume/nfs.pp:72:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571625 | manifests/profile/base/docker.pp:188:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571661 | manifests/profile/base/docker.pp:210:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571699 | manifests/profile/base/logging/fluentd.pp:79:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571735 | manifests/profile/base/pacemaker.pp:107:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571773 | manifests/profile/base/swift/ringbuilder.pp:97:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571811 | manifests/profile/base/swift/ringbuilder.pp:125:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571850 | manifests/profile/base/swift/ringbuilder.pp:130:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571889 | manifests/profile/pacemaker/ceph/rbdmirror.pp:79:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571927 | manifests/profile/pacemaker/cinder/backup.pp:66:WARNING: arrow should be on the right operand's line 2017-07-20 15:09:38.571965 | manifests/profile/pacemaker/ovn_northd.pp:96:WARNING: arrow should be on the right operand's line Change-Id: I9393c5e04310cf84695531df9bb16f33e7e15abb --- manifests/profile/pacemaker/ceph/rbdmirror.pp | 4 ++-- manifests/profile/pacemaker/cinder/backup.pp | 3 +-- manifests/profile/pacemaker/ovn_northd.pp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'manifests/profile/pacemaker') 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/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}"] } } -- cgit 1.2.3-korg