From 198645cd2c84491ea8b4e7fe0aedf647ca2f6c04 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 15 Dec 2014 11:49:03 +0000
Subject: [PATCH] Add swift_all inventory to swift account/container/object
 plays

This patch adds the swift_all inventory to the swift account, container
and object plays to ensure that the correct service name is used when
the play configures the upstart services.
Without including the inventory a different service name is used,
resulting in upstart trying to find the config files in /etc/neutron.

Change-Id: I725e87fca647a21ea0e2d64952626b6f6fc6e2a3
Closes-Bug: #1402617
---
 rpc_deployment/playbooks/openstack/swift-account.yml     | 1 +
 rpc_deployment/playbooks/openstack/swift-build-rings.yml | 2 ++
 rpc_deployment/playbooks/openstack/swift-container.yml   | 1 +
 rpc_deployment/playbooks/openstack/swift-object.yml      | 1 +
 4 files changed, 5 insertions(+)

diff --git a/rpc_deployment/playbooks/openstack/swift-account.yml b/rpc_deployment/playbooks/openstack/swift-account.yml
index b2ff902587..a19aa4cf59 100644
--- a/rpc_deployment/playbooks/openstack/swift-account.yml
+++ b/rpc_deployment/playbooks/openstack/swift-account.yml
@@ -19,6 +19,7 @@
     - swift_init_scripts
     - swift_account
   vars_files:
+    - inventory/group_vars/swift_all.yml
     - vars/openstack_service_vars/swift_account.yml
   handlers:
     - include: handlers/swift_services.yml
diff --git a/rpc_deployment/playbooks/openstack/swift-build-rings.yml b/rpc_deployment/playbooks/openstack/swift-build-rings.yml
index f1cee27595..ed3086fab7 100644
--- a/rpc_deployment/playbooks/openstack/swift-build-rings.yml
+++ b/rpc_deployment/playbooks/openstack/swift-build-rings.yml
@@ -33,3 +33,5 @@
   user: root
   roles:
     - swift_ring_distribute
+  vars_files:
+    - inventory/group_vars/swift_all.yml
diff --git a/rpc_deployment/playbooks/openstack/swift-container.yml b/rpc_deployment/playbooks/openstack/swift-container.yml
index 2bb02cf0a6..8ec5cdf4f5 100644
--- a/rpc_deployment/playbooks/openstack/swift-container.yml
+++ b/rpc_deployment/playbooks/openstack/swift-container.yml
@@ -19,6 +19,7 @@
     - swift_init_scripts
     - swift_container
   vars_files:
+    - inventory/group_vars/swift_all.yml
     - vars/openstack_service_vars/swift_container.yml
   handlers:
     - include: handlers/swift_services.yml
diff --git a/rpc_deployment/playbooks/openstack/swift-object.yml b/rpc_deployment/playbooks/openstack/swift-object.yml
index 1caa30f560..57cf1036e7 100644
--- a/rpc_deployment/playbooks/openstack/swift-object.yml
+++ b/rpc_deployment/playbooks/openstack/swift-object.yml
@@ -19,6 +19,7 @@
     - swift_init_scripts
     - swift_object
   vars_files:
+    - inventory/group_vars/swift_all.yml
     - vars/openstack_service_vars/swift_object.yml
   handlers:
     - include: handlers/swift_services.yml