Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398140 )
Change subject: openstack: consistent style for ensure present
......................................................................
openstack: consistent style for ensure present
present => 'present'
Change-Id: Ic9f75873e07dcfcc5dda4024ade8636a817d9179
---
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/designate/dns_floating_ip_updater.pp
M modules/openstack/manifests/glance/image_sync.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api/service.pp
M modules/openstack/manifests/nova/compute/service.pp
M modules/openstack/manifests/nova/conductor/service.pp
M modules/openstack/manifests/nova/network/service.pp
M modules/openstack/manifests/nova/spiceproxy/service.pp
M modules/openstack/manifests/util/admin_scripts.pp
M modules/openstack/manifests/wikitech/openstack_manager.pp
12 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/398140/1
diff --git a/modules/openstack/manifests/clientlib.pp
b/modules/openstack/manifests/clientlib.pp
index d1e5ee1..85eda78 100644
--- a/modules/openstack/manifests/clientlib.pp
+++ b/modules/openstack/manifests/clientlib.pp
@@ -18,7 +18,7 @@
# Wrapper python class to easily query openstack clients
file { '/usr/lib/python2.7/dist-packages/mwopenstackclients.py':
- ensure => present,
+ ensure => 'present',
source =>
'puppet:///modules/openstack/clientlib/mwopenstackclients.py',
mode => '0755',
owner => 'root',
diff --git a/modules/openstack/manifests/designate/dns_floating_ip_updater.pp
b/modules/openstack/manifests/designate/dns_floating_ip_updater.pp
index 9e284b0..1863946 100644
--- a/modules/openstack/manifests/designate/dns_floating_ip_updater.pp
+++ b/modules/openstack/manifests/designate/dns_floating_ip_updater.pp
@@ -21,7 +21,7 @@
}
file { '/etc/labs-floating-ips-dns-config.yaml':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0440',
@@ -29,7 +29,7 @@
}
file { '/etc/dns-floating-ip-updater.py':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0750',
diff --git a/modules/openstack/manifests/glance/image_sync.pp
b/modules/openstack/manifests/glance/image_sync.pp
index dfa6a1c..f96be67 100644
--- a/modules/openstack/manifests/glance/image_sync.pp
+++ b/modules/openstack/manifests/glance/image_sync.pp
@@ -17,7 +17,7 @@
# Set up a keypair and rsync image files between active and standby
user { 'glancesync':
- ensure => present,
+ ensure => 'present',
name => 'glancesync',
shell => '/bin/sh',
comment => 'glance rsync user',
@@ -28,7 +28,7 @@
}
ssh::userkey { 'glancesync':
- ensure => present,
+ ensure => 'present',
require => User['glancesync'],
content => secret('ssh/glancesync/glancesync.pub'),
}
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 5c2d4e8..29bd89c 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -14,7 +14,7 @@
) {
package { 'glance':
- ensure => present,
+ ensure => 'present',
}
file { $glance_data:
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index bbbdce7..44f8dfc 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -58,7 +58,7 @@
if $token_driver == 'redis' {
package { 'python-keystone-redis':
- ensure => present;
+ ensure => 'present';
}
}
diff --git a/modules/openstack/manifests/nova/api/service.pp
b/modules/openstack/manifests/nova/api/service.pp
index d7fe098..8011e9b 100644
--- a/modules/openstack/manifests/nova/api/service.pp
+++ b/modules/openstack/manifests/nova/api/service.pp
@@ -7,7 +7,7 @@
require openstack::nova::common
package { 'nova-api':
- ensure => present,
+ ensure => 'present',
}
service { 'nova-api':
diff --git a/modules/openstack/manifests/nova/compute/service.pp
b/modules/openstack/manifests/nova/compute/service.pp
index aad8727..15f5f07 100644
--- a/modules/openstack/manifests/nova/compute/service.pp
+++ b/modules/openstack/manifests/nova/compute/service.pp
@@ -24,14 +24,14 @@
# was split from the bridge kernel module into a separate module
(br_netfilter)
if (versioncmp($::kernelversion, '3.18') >= 0) {
kmod::module { 'br_netfilter':
- ensure => present,
+ ensure => 'present',
}
}
# Without qemu-system, apt will install qemu-kvm by default,
# which is somewhat broken.
package { 'qemu-system':
- ensure => present,
+ ensure => 'present',
}
package { [
diff --git a/modules/openstack/manifests/nova/conductor/service.pp
b/modules/openstack/manifests/nova/conductor/service.pp
index 6e65dc1..c5f9d62 100644
--- a/modules/openstack/manifests/nova/conductor/service.pp
+++ b/modules/openstack/manifests/nova/conductor/service.pp
@@ -10,7 +10,7 @@
require openstack::nova::common
package { 'nova-conductor':
- ensure => present,
+ ensure => 'present',
}
service { 'nova-conductor':
diff --git a/modules/openstack/manifests/nova/network/service.pp
b/modules/openstack/manifests/nova/network/service.pp
index d9eee9c..29b289f 100644
--- a/modules/openstack/manifests/nova/network/service.pp
+++ b/modules/openstack/manifests/nova/network/service.pp
@@ -15,7 +15,7 @@
$recursor_secondary_ip = ipresolve($dns_recursor_secondary,4)
package { [ 'nova-network', 'dnsmasq' ]:
- ensure => present,
+ ensure => 'present',
}
file { '/etc/dnsmasq-nova.conf':
@@ -31,7 +31,7 @@
# Do Not Include Base::Firewall
file { '/etc/modprobe.d/nf_conntrack.conf':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/openstack/manifests/nova/spiceproxy/service.pp
b/modules/openstack/manifests/nova/spiceproxy/service.pp
index 05fdea2..df359a0 100644
--- a/modules/openstack/manifests/nova/spiceproxy/service.pp
+++ b/modules/openstack/manifests/nova/spiceproxy/service.pp
@@ -9,7 +9,7 @@
require openstack::nova::common
package { ['nova-spiceproxy', 'nova-consoleauth', 'spice-html5',
'websockify']:
- ensure => present,
+ ensure => 'present',
}
# The default spice_auto.html file doesn't support wss so won't
diff --git a/modules/openstack/manifests/util/admin_scripts.pp
b/modules/openstack/manifests/util/admin_scripts.pp
index f3a6ecf..4040e72 100644
--- a/modules/openstack/manifests/util/admin_scripts.pp
+++ b/modules/openstack/manifests/util/admin_scripts.pp
@@ -12,7 +12,7 @@
# Script to cold-migrate instances between compute nodes
file { '/root/cold-nova-migrate':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -21,7 +21,7 @@
# Script to migrate (with suspension) instances between compute nodes
file { '/root/live-migrate':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -30,7 +30,7 @@
# Set up keystone services (example script)
file { '/root/prod-example.sh':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -38,12 +38,12 @@
}
file { '/root/novastats':
- ensure => directory,
+ ensure => 'directory',
owner => 'root',
}
file { '/root/novastats/imagestats.py':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -52,7 +52,7 @@
}
file { '/root/novastats/diskspace.py':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -85,7 +85,7 @@
}
file { '/root/novastats/flavorreport.py':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -93,7 +93,7 @@
}
file { '/root/novastats/alltrusty.py':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -101,7 +101,7 @@
}
file { '/usr/local/sbin/wikitech-grep':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -119,7 +119,7 @@
# This ignores most nova facilities so is a good last resort
# when nova is misbehaving.
file { '/root/cold-migrate':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
@@ -130,7 +130,7 @@
# zones in Designate. These DNS zones are used by clients inside Cloud
# VPS/Toolforge to connect to the Wiki Replica databases.
file { '/etc/wikireplica_dns.yaml':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0644',
@@ -138,7 +138,7 @@
}
file { '/usr/local/sbin/wikireplica_dns':
- ensure => present,
+ ensure => 'present',
owner => 'root',
group => 'root',
mode => '0755',
diff --git a/modules/openstack/manifests/wikitech/openstack_manager.pp
b/modules/openstack/manifests/wikitech/openstack_manager.pp
index 2404fd3..045f590 100644
--- a/modules/openstack/manifests/wikitech/openstack_manager.pp
+++ b/modules/openstack/manifests/wikitech/openstack_manager.pp
@@ -30,7 +30,7 @@
package { [
'php5-ldap',
'librsvg2-bin']:
- ensure => present;
+ ensure => 'present';
}
require_package([
--
To view, visit https://gerrit.wikimedia.org/r/398140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9f75873e07dcfcc5dda4024ade8636a817d9179
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
