summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-24 17:31:44 +0000
committerGerrit Code Review <review@openstack.org>2017-07-24 17:31:44 +0000
commit07500da43e6a991511099a37106015037da159b8 (patch)
tree2ba954921ccd7b31902bbc230556ccc7d5ddcf3c
parent207e9feab3fa803122c47b8d162909f737655766 (diff)
parent9b438a0249d59399c63c016921a9b6add8159dd2 (diff)
Merge "Fix lint issues to upgrade to puppet-lint 2.3"
-rw-r--r--manifests/glance/nfs_mount.pp4
-rw-r--r--manifests/pacemaker/haproxy_with_vip.pp8
-rw-r--r--manifests/pacemaker/resource_restart_flag.pp4
-rw-r--r--manifests/profile/base/cinder/volume/nfs.pp19
-rw-r--r--manifests/profile/base/docker.pp8
-rw-r--r--manifests/profile/base/logging/fluentd.pp4
-rw-r--r--manifests/profile/base/pacemaker.pp4
-rw-r--r--manifests/profile/base/swift/ringbuilder.pp12
-rw-r--r--manifests/profile/pacemaker/ceph/rbdmirror.pp4
-rw-r--r--manifests/profile/pacemaker/cinder/backup.pp3
-rw-r--r--manifests/profile/pacemaker/ovn_northd.pp4
11 files changed, 37 insertions, 37 deletions
diff --git a/manifests/glance/nfs_mount.pp b/manifests/glance/nfs_mount.pp
index 674bdd0..9ff4f8b 100644
--- a/manifests/glance/nfs_mount.pp
+++ b/manifests/glance/nfs_mount.pp
@@ -62,8 +62,8 @@ class tripleo::glance::nfs_mount (
file { $images_dir:
ensure => directory,
- } ->
- exec { 'NFS mount for glance file backend':
+ }
+ -> exec { 'NFS mount for glance file backend':
path => ['/usr/sbin', '/usr/bin'],
command => "mount -t nfs '${share}' '${images_dir}' ${options_part}",
unless => "mount | grep ' ${images_dir} '",
diff --git a/manifests/pacemaker/haproxy_with_vip.pp b/manifests/pacemaker/haproxy_with_vip.pp
index 606ac26..14572e0 100644
--- a/manifests/pacemaker/haproxy_with_vip.pp
+++ b/manifests/pacemaker/haproxy_with_vip.pp
@@ -104,9 +104,9 @@ define tripleo::pacemaker::haproxy_with_vip(
default => Pacemaker::Resource::Service['haproxy']
}
- Pacemaker::Resource::Ip["${vip_name}_vip"] ->
- $service_resource ->
- Pacemaker::Constraint::Order["${vip_name}_vip-then-haproxy"] ->
- Pacemaker::Constraint::Colocation["${vip_name}_vip-with-haproxy"]
+ Pacemaker::Resource::Ip["${vip_name}_vip"]
+ -> $service_resource
+ -> Pacemaker::Constraint::Order["${vip_name}_vip-then-haproxy"]
+ -> Pacemaker::Constraint::Colocation["${vip_name}_vip-with-haproxy"]
}
}
diff --git a/manifests/pacemaker/resource_restart_flag.pp b/manifests/pacemaker/resource_restart_flag.pp
index c201c9b..860250b 100644
--- a/manifests/pacemaker/resource_restart_flag.pp
+++ b/manifests/pacemaker/resource_restart_flag.pp
@@ -41,6 +41,6 @@ define tripleo::pacemaker::resource_restart_flag() {
refreshonly => true,
}
- File['/var/lib/tripleo/pacemaker-restarts'] ->
- Exec["${title} resource restart flag"]
+ File['/var/lib/tripleo/pacemaker-restarts']
+ -> Exec["${title} resource restart flag"]
}
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index 16a49e4..1eef888 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -62,21 +62,22 @@ class tripleo::profile::base::cinder::volume::nfs (
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {
- if str2bool($::selinux) {
- selboolean { 'virt_use_nfs':
- value => on,
- persistent => true,
- } -> Package['nfs-utils']
- }
-
- package {'nfs-utils': } ->
- cinder::backend::nfs { $backend_name :
+ package {'nfs-utils': }
+ -> cinder::backend::nfs { $backend_name :
nfs_servers => $cinder_nfs_servers,
nfs_mount_options => $cinder_nfs_mount_options,
nfs_shares_config => '/etc/cinder/shares-nfs.conf',
nas_secure_file_operations => $cinder_nas_secure_file_operations,
nas_secure_file_permissions => $cinder_nas_secure_file_permissions,
}
+
+ if str2bool($::selinux) {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ require => Package['nfs-utils'],
+ }
+ }
}
}
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp
index 2c9824a..e042947 100644
--- a/manifests/profile/base/docker.pp
+++ b/manifests/profile/base/docker.pp
@@ -185,8 +185,8 @@ class tripleo::profile::base::docker (
group { 'docker_nova_group':
name => 'docker_nova',
gid => $docker_nova_uid
- } ->
- user { 'docker_nova_user':
+ }
+ -> user { 'docker_nova_user':
name => 'docker_nova',
uid => $docker_nova_uid,
gid => $docker_nova_uid,
@@ -207,8 +207,8 @@ polkit.addRule(function(action, subject) {
'
package {'polkit':
ensure => installed,
- } ->
- file {'/etc/polkit-1/rules.d/50-nova.rules':
+ }
+ -> file {'/etc/polkit-1/rules.d/50-nova.rules':
content => $docker_nova_polkit_rule,
mode => '0644'
}
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index 51869d6..b23610a 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -76,8 +76,8 @@ class tripleo::profile::base::logging::fluentd (
include ::fluentd
if $fluentd_groups {
- Package<| tag == 'openstack' |> ->
- user { $::fluentd::config_owner:
+ Package<| tag == 'openstack' |>
+ -> user { $::fluentd::config_owner:
ensure => present,
groups => $fluentd_groups,
membership => 'minimum',
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index bc15e62..d468110 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -104,8 +104,8 @@ class tripleo::profile::base::pacemaker (
}
class { '::pacemaker':
hacluster_pwd => hiera('hacluster_pwd'),
- } ->
- class { '::pacemaker::corosync':
+ }
+ -> class { '::pacemaker::corosync':
cluster_members => $pacemaker_cluster_members,
setup_cluster => $pacemaker_master,
cluster_setup_extras => $cluster_setup_extras,
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 3ab3234..27cf4fe 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -94,8 +94,8 @@ class tripleo::profile::base::swift::ringbuilder (
path => ['/usr/bin'],
command => "curl --insecure --silent '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
returns => [0, 3]
- } ~>
- exec{'extract_swift_ring_tarball':
+ }
+ ~> exec{'extract_swift_ring_tarball':
path => ['/bin'],
command => 'tar xzf /tmp/swift-rings.tar.gz -C /',
returns => [0, 2]
@@ -122,15 +122,15 @@ class tripleo::profile::base::swift::ringbuilder (
part_power => $part_power,
replicas => min(count($device_array), $replicas),
min_part_hours => $min_part_hours,
- } ->
+ }
# add all other devices
- tripleo::profile::base::swift::add_devices {$device_array:
+ -> tripleo::profile::base::swift::add_devices {$device_array:
swift_zones => $swift_zones,
- } ->
+ }
# rebalance
- swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
+ -> swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
seed => '999',
}
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}"]
}
}