From e131b46f4b02e67431047f90a3f8ab3756c7164b Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovazn@redhat.com>
Date: Tue, 3 Feb 2015 09:41:19 -0500
Subject: [PATCH] Add missing swift configuration

Swift service is already included in undercloud but
doesn't work properly - missing endpoint, misconfigured
swift-proxy service. This patch fixes the issues.

Swift is needed by Heat for using "tempurl" signallig.

Change-Id: I8676423684080e1281da1089449a177e80939d4e
---
 .../puppet-stack-config/puppet-stack-config.pp    | 15 +++++++++++++++
 .../post-configure.d/98-undercloud-setup          |  3 ++-
 scripts/instack-apply-config                      |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 6a1a23f32..b7d9894e5 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -198,6 +198,7 @@ class { 'neutron::agents::ml2::ovs':
 # swift proxy
 include ::memcached
 include ::swift::proxy
+include ::swift::ringbuilder
 include ::swift::proxy::proxy_logging
 include ::swift::proxy::healthcheck
 include ::swift::proxy::cache
@@ -227,6 +228,20 @@ $swift_components = ['account', 'container', 'object']
 swift::storage::filter::recon { $swift_components : }
 swift::storage::filter::healthcheck { $swift_components : }
 
+$controller_host = hiera('controller_host')
+@@ring_object_device { "${controller_host}:6000/1":
+  zone   => 1,
+  weight => 1,
+}
+@@ring_container_device { "${controller_host}:6001/1":
+  zone   => 1,
+  weight => 1,
+}
+@@ring_account_device { "${controller_host}:6002/1":
+  zone   => 1,
+  weight => 1,
+}
+
 # Ceilometer
 include ::ceilometer
 include ::ceilometer::api
diff --git a/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup b/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
index 8e1aba0a8..08dc06134 100755
--- a/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
+++ b/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
@@ -53,7 +53,8 @@ ENDPOINT_LIST="--glance-password $UNDERCLOUD_GLANCE_PASSWORD
     --nova-password $UNDERCLOUD_NOVA_PASSWORD
     --tuskar-password $UNDERCLOUD_TUSKAR_PASSWORD
     --ironic-password $UNDERCLOUD_IRONIC_PASSWORD
-    --ceilometer-password $UNDERCLOUD_CEILOMETER_PASSWORD"
+    --ceilometer-password $UNDERCLOUD_CEILOMETER_PASSWORD
+    --swift-password $UNDERCLOUD_SWIFT_PASSWORD"
 
 REGISTER_SERVICE_OPTS=
 
diff --git a/scripts/instack-apply-config b/scripts/instack-apply-config
index f04f8efc5..9a4212ff4 100755
--- a/scripts/instack-apply-config
+++ b/scripts/instack-apply-config
@@ -44,6 +44,7 @@ export UNDERCLOUD_NEUTRON_PASSWORD=${UNDERCLOUD_NEUTRON_PASSWORD:-$(tripleo os-m
 export UNDERCLOUD_NOVA_PASSWORD=${UNDERCLOUD_NOVA_PASSWORD:-$(tripleo os-make-password)}
 export UNDERCLOUD_IRONIC_PASSWORD=${UNDERCLOUD_IRONIC_PASSWORD:-$(tripleo os-make-password)}
 export UNDERCLOUD_TUSKAR_PASSWORD=${UNDERCLOUD_TUSKAR_PASSWORD:-$(tripleo os-make-password)}
+export UNDERCLOUD_SWIFT_PASSWORD=${UNDERCLOUD_SWIFT_PASSWORD:-$(tripleo os-make-password)}
 
 if [ -z "$INSTACK_ROOT" ]; then
     sudo -E /usr/share/instack-undercloud/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata