From fb28647f7d46bb7f145c25f9adf558d823eb292c Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Fri, 17 Feb 2017 16:31:52 +0000
Subject: Migrate Swift ring handling from tripleo-heat-templates to
 puppet-tripleo

This allows decoupling the Swift ringbuilding logic from the Controller
and ObjectStorage roles. A follow up patch will modify
tripleo-heat-templates and use this modified class.

Actually this downloads the Swift rings even if ring building is
disabled or if there is no need to rebalance. This is required, because
operators can disable ring building, but use the same mechanism to
distribute pre-built rings to the nodes.

If ring building is disabled, these won't be uploaded at the end back to
the undercloud.

Related-Bug: 1665641
Change-Id: Ifd6fa5b398d98e8998630ea0c9a2ce9867ceba2b
(cherry picked from commit 3412150d91dc7fe6e9f168b4ffdbb4d54c39fc55)
---
 manifests/profile/base/swift/ringbuilder.pp        | 36 ++++++++++++
 .../tripleo_profile_base_swift_ringbuilder.rb      | 65 ++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 spec/classes/tripleo_profile_base_swift_ringbuilder.rb

diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 7e5fc74..f7cfea4 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -63,6 +63,12 @@
 #  Minimum amount of time before partitions can be moved.
 #  Defaults to undef
 #
+# [*swift_ring_get_tempurl*]
+# GET tempurl to fetch Swift rings from
+#
+# [*swift_ring_put_tempurl*]
+# PUT tempurl to upload Swift rings to
+#
 class tripleo::profile::base::swift::ringbuilder (
   $replicas,
   $build_ring  = true,
@@ -74,7 +80,23 @@ class tripleo::profile::base::swift::ringbuilder (
   $swift_storage_node_ips = hiera('swift_storage_node_ips', []),
   $part_power = undef,
   $min_part_hours = undef,
+  $swift_ring_get_tempurl = hiera('swift_ring_get_tempurl', ''),
+  $swift_ring_put_tempurl = hiera('swift_ring_put_tempurl', ''),
 ) {
+
+  if $step == 2 and $swift_ring_get_tempurl != '' {
+    exec{'fetch_swift_ring_tarball':
+      path    => ['/usr/bin'],
+      command => "curl --insecure --silent '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
+      returns => [0, 3]
+    } ~>
+    exec{'extract_swift_ring_tarball':
+      path    => ['/bin'],
+      command => 'tar xzf /tmp/swift-rings.tar.gz -C /',
+      returns => [0, 2]
+    }
+  }
+
   if $step >= 2 {
     # pre-install swift here so we can build rings
     include ::swift
@@ -112,4 +134,18 @@ class tripleo::profile::base::swift::ringbuilder (
       Ring_object_device<| |> ~> Exec['rebalance_container']
     }
   }
+
+  if $step == 5 and $build_ring and $swift_ring_put_tempurl != '' {
+    exec{'create_swift_ring_tarball':
+      path    => ['/bin', '/usr/bin'],
+      command => 'tar cvzf /tmp/swift-rings.tar.gz /etc/swift/*.builder /etc/swift/*.ring.gz /etc/swift/backups/',
+      unless  => 'swift-recon --md5 | grep -q "doesn\'t match"'
+    } ~>
+    exec{'upload_swift_ring_tarball':
+      path        => ['/usr/bin'],
+      command     => "curl --insecure --silent -X PUT '${$swift_ring_put_tempurl}' --data-binary @/tmp/swift-rings.tar.gz",
+      require     => Exec['create_swift_ring_tarball'],
+      refreshonly => true,
+    }
+  }
 }
diff --git a/spec/classes/tripleo_profile_base_swift_ringbuilder.rb b/spec/classes/tripleo_profile_base_swift_ringbuilder.rb
new file mode 100644
index 0000000..0139815
--- /dev/null
+++ b/spec/classes/tripleo_profile_base_swift_ringbuilder.rb
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2017 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+require 'spec_helper'
+
+describe 'tripleo::profile::base::swift::ringbuilder' do
+  shared_examples_for 'tripleo::profile::base::swift::ringbuilder' do
+
+    let :pre_condition do
+      "class { '::swift':
+         swift_hash_path_prefix => 'foo',
+       }"
+    end
+
+    context 'with step 2 and swift_ring_get_tempurl set' do
+      let(:params) { {
+        :step => 2,
+        :replicas => 1,
+        :swift_ring_get_tempurl=> 'http://something'
+      } }
+
+      it 'should fetch and extract swift rings' do
+        is_expected.to contain_exec('fetch_swift_ring_tarball')
+        is_expected.to contain_exec('extract_swift_ring_tarball')
+      end
+    end
+
+    context 'with step 5 and swift_ring_put_tempurl set' do
+      let(:params) { {
+        :step => 5,
+        :replicas => 1,
+        :swift_ring_put_tempurl=> 'http://something'
+      } }
+
+      it 'should pack and upload swift rings' do
+        is_expected.to contain_exec('create_swift_ring_tarball')
+        is_expected.to contain_exec('upload_swift_ring_tarball')
+      end
+    end
+
+  end
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) do
+        facts.merge({})
+      end
+
+      it_behaves_like 'tripleo::profile::base::swift::ringbuilder'
+    end
+  end
+end
-- 
cgit 1.2.3-korg