Merge lp:~jjo/charms/trusty/swift-storage/fix-upstart-nrpe-checks into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[JuanJo Ciarlante]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #5711 swift-storage-next for jjo mp263597
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5711/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #5343 swift-storage-next for jjo mp263597
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5343/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4903 swift-storage-next for jjo mp263597
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4903/

[Mick Gregg (macgreagoir)]

Confirmed service names and use in update_nrpe_config(). LGTM

review: Approve

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/swift_storage_utils.py'
--- hooks/swift_storage_utils.py	2015-04-01 16:05:59 +0000
+++ hooks/swift_storage_utils.py	2015-07-01 21:38:03 +0000
@@ -84,19 +84,19 @@
 ]
 
 SWIFT_SVCS = [
-    'account-auditor',
-    'account-reaper',
-    'account-replicator',
-    'account-server',
-    'container-auditor',
-    'container-replicator',
-    'container-server',
-    'container-sync',
-    'container-updater',
-    'object-auditor',
-    'object-replicator',
-    'object-server',
-    'object-updater',
+    'swift-account-auditor',
+    'swift-account-reaper',
+    'swift-account-replicator',
+    'swift-account-server',
+    'swift-container-auditor',
+    'swift-container-replicator',
+    'swift-container-server',
+    'swift-container-sync',
+    'swift-container-updater',
+    'swift-object-auditor',
+    'swift-object-replicator',
+    'swift-object-server',
+    'swift-object-updater',
     ]
 
 RESTART_MAP = {