From 3b02e5afc8368a15cffbce82711a03a81299e4a0 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 8 Apr 2016 12:35:29 -0400
Subject: [PATCH] swift: use ipv6 binding on centos7 nodes

If IPv6 is enabled (on centos7 now), deploy Swift using this binding.
Note: adding notes in TODO to also deploy memcached in IPv6 later.

Change-Id: I8c8e8e8870212765f8b8a0d639194e040963d6e0
---
 manifests/swift.pp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/manifests/swift.pp b/manifests/swift.pp
index a2c95b502..70654a06f 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -2,12 +2,13 @@ class openstack_integration::swift {
 
   include ::openstack_integration::config
 
+  # TODO(emilien): deploy memcached in IPv6
   include ::memcached
   class { '::swift':
     swift_hash_suffix => 'secrete',
   }
   class { '::swift::proxy':
-    proxy_local_net_ip => '127.0.0.1',
+    proxy_local_net_ip => $::openstack_integration::config::host,
     workers            => '2',
     pipeline           => [
   'catch_errors', 'healthcheck', 'cache', 'tempurl', 'ratelimit',
@@ -18,6 +19,7 @@ class openstack_integration::swift {
   include ::swift::proxy::catch_errors
   include ::swift::proxy::healthcheck
   include ::swift::proxy::proxy_logging
+  # TODO(emilien): deploy ::swift::proxy::cache in IPv6
   include ::swift::proxy::cache
   include ::swift::proxy::tempurl
   include ::swift::proxy::ratelimit
@@ -35,6 +37,9 @@ class openstack_integration::swift {
   include ::swift::proxy::account_quotas
   include ::swift::proxy::tempauth
   class { '::swift::keystone::auth':
+    public_url     => "http://${::openstack_integration::config::ip_for_url}:8080/v1/AUTH_%(tenant_id)s",
+    admin_url      => "http://${::openstack_integration::config::ip_for_url}:8080",
+    internal_url   => "http://${::openstack_integration::config::ip_for_url}:8080/v1/AUTH_%(tenant_id)s",
     password       => 'a_big_secret',
     operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'],
   }
@@ -46,7 +51,7 @@ class openstack_integration::swift {
   }
   include ::swift::ringbuilder
   class { '::swift::storage::all':
-    storage_local_net_ip => '127.0.0.1',
+    storage_local_net_ip => $::openstack_integration::config::host,
     incoming_chmod       => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
     outgoing_chmod       => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
     mount_check          => false,
@@ -56,15 +61,15 @@ class openstack_integration::swift {
   swift::storage::filter::healthcheck { $swift_components : }
   # As of mitaka swift-ring-builder requires devices >= replica count
   # Default replica count is 3
-  ring_object_device { ['127.0.0.1:6000/1', '127.0.0.1:6000/2', '127.0.0.1:6000/3']:
+  ring_object_device { ["${::openstack_integration::config::ip_for_url}:6000/1", "${::openstack_integration::config::ip_for_url}:6000/2", "${::openstack_integration::config::ip_for_url}:6000/3"]:
     zone   => 1,
     weight => 1,
   }
-  ring_container_device { ['127.0.0.1:6001/1', '127.0.0.1:6001/2','127.0.0.1:6001/3']:
+  ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/1", "${::openstack_integration::config::ip_for_url}:6001/2", "${::openstack_integration::config::ip_for_url}:6001/3"]:
     zone   => 1,
     weight => 1,
   }
-  ring_account_device { ['127.0.0.1:6002/1', '127.0.0.1:6002/2','127.0.0.1:6002/3']:
+  ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/1", "${::openstack_integration::config::ip_for_url}:6002/2", "${::openstack_integration::config::ip_for_url}:6002/3"]:
     zone   => 1,
     weight => 1,
   }