openstack/puppet-ceph
Code Issues Proposed changes

Fix lint issues to upgrade to puppet-lint 2.3

Browse Source 
2017-07-20 14:28:44.376006 | manifests/mon.pp:121:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376112 | manifests/mon.pp:157:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376146 | manifests/mon.pp:165:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376178 | manifests/mon.pp:203:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376209 | manifests/mon.pp:209:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376240 | manifests/mon.pp:230:WARNING: arrow should be on the right operand's line
2017-07-20 14:28:44.376286 | manifests/mon.pp:244:WARNING: arrow should be on the right operand's line

Change-Id: I2fe4ed016100ebda260dcfdc67d2907c7cc06787
This commit is contained in:
Carlos Camacho 2017-07-20 19:54:43 +02:00
parent 3366cbc431
commit e72b6f34d2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/mon.pp
View File

@ -118,8 +118,8 @@ define ceph::mon (
if $key {
$keyring_path = "/tmp/ceph-mon-keyring-${id}"
Ceph_config<||> ->
exec { "create-keyring-${id}":
Ceph_config<||>
-> exec { "create-keyring-${id}":
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
cat > ${keyring_path} << EOF
@ -154,9 +154,9 @@ test -e \$mon_data/done
}
}
Ceph_config<||> ->
Ceph_config<||>
# prevent automatic creation of the client.admin key by ceph-create-keys
exec { "ceph-mon-${cluster_name}.client.admin.keyring-${id}":
-> exec { "ceph-mon-${cluster_name}.client.admin.keyring-${id}":
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
touch /etc/ceph/${cluster_name}.client.admin.keyring",
@ -164,8 +164,7 @@ touch /etc/ceph/${cluster_name}.client.admin.keyring",
set -ex
test -e /etc/ceph/${cluster_name}.client.admin.keyring",
}
->
exec { $ceph_mkfs:
-> exec { $ceph_mkfs:
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=\$(ceph-mon ${cluster_option} --id ${id} --show-config-value mon_data)
@ -202,14 +201,14 @@ test -d \$mon_data
",
logoutput => true,
timeout => $exec_timeout,
}->
service { $mon_service:
}
-> service { $mon_service:
ensure => running,
}
# if the service is running before we setup the configs, notify service
Ceph_config<||> ~>
Service[$mon_service]
Ceph_config<||>
~> Service[$mon_service]
if $authentication_type == 'cephx' {
if $key {
@ -229,8 +228,7 @@ test ! -e ${keyring_path}
service { $mon_service:
ensure => stopped
}
->
exec { "remove-mon-${id}":
-> exec { "remove-mon-${id}":
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=\$(ceph-mon ${cluster_option} --id ${id} --show-config-value mon_data)
@ -244,8 +242,8 @@ test ! -d \$mon_data
",
logoutput => true,
timeout => $exec_timeout,
} ->
ceph_config {
}
-> ceph_config {
"mon.${id}/public_addr": ensure => absent;
} -> Package<| tag == 'ceph' |>
} else {