From 781165b84bccef297ac786a98ac8fedf8be907f7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 21 Sep 2019 22:13:28 +0900
Subject: [PATCH] Use memcached for token caching in manila authtoken

Use memcached to cache token in manila authtoken, as in-process
cache, which we currently use, was already deprecated[1].

[1] Ied2b88c8cefe5655a88d0c2f334de04e588fa75a

Change-Id: I9360c689b322ffc21107edb94524374578811d21
---
 manifests/profile/base/manila/api.pp          |  1 +
 manifests/profile/base/manila/authtoken.pp    | 44 ++++++++++++
 ...pleo_profile_base_manila_authtoken_spec.rb | 70 +++++++++++++++++++
 spec/fixtures/hieradata/default.yaml          |  1 +
 4 files changed, 116 insertions(+)
 create mode 100644 manifests/profile/base/manila/authtoken.pp
 create mode 100644 spec/classes/tripleo_profile_base_manila_authtoken_spec.rb

diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 5988c1187..b3a1b6c7c 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -97,6 +97,7 @@ class tripleo::profile::base::manila::api (
   }
 
   include ::tripleo::profile::base::manila
+  include ::tripleo::profile::base::manila::authtoken
 
   if $enable_internal_tls {
     if !$manila_api_network {
diff --git a/manifests/profile/base/manila/authtoken.pp b/manifests/profile/base/manila/authtoken.pp
new file mode 100644
index 000000000..427856fe6
--- /dev/null
+++ b/manifests/profile/base/manila/authtoken.pp
@@ -0,0 +1,44 @@
+# Copyright 2019 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.
+#
+# == Class: tripleo::profile::base::manila::authtoken
+#
+# Manila authtoken profile for TripleO
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+# [*memcached_ips*]
+#   (Optional) Array of ipv4 or ipv6 addresses for memcache.
+#   Defaults to hiera('memcached_node_ips')
+#
+class tripleo::profile::base::manila::authtoken (
+  $step                = Integer(hiera('step')),
+  $memcached_ips       = hiera('memcached_node_ips'),
+) {
+
+  if $step >= 3 {
+    if is_ipv6_address($memcached_ips[0]) {
+      $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:')
+    } else {
+      $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
+    }
+
+    class { '::manila::keystone::authtoken':
+      memcached_servers => $memcache_servers
+    }
+  }
+}
diff --git a/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb b/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb
new file mode 100644
index 000000000..5f3a8a315
--- /dev/null
+++ b/spec/classes/tripleo_profile_base_manila_authtoken_spec.rb
@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2019 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::manila::authtoken' do
+  shared_examples_for 'tripleo::profile::base::manila::authtoken' do
+    context 'with step less than 3' do
+      let(:params) { {
+        :step => 1,
+      } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
+        is_expected.to_not contain_class('manila::keystone::authtoken')
+      }
+    end
+
+    context 'with step 3' do
+      let(:params) { {
+        :step => 3,
+        :memcached_ips => '127.0.0.1',
+      } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
+        is_expected.to contain_class('manila::keystone::authtoken').with(
+            :memcached_servers => ['127.0.0.1:11211'])
+      }
+    end
+
+    context 'with step 3 with ipv6' do
+      let(:params) { {
+        :step     => 3,
+        :memcached_ips => '::1',
+      } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
+        is_expected.to contain_class('manila::keystone::authtoken').with(
+            :memcached_servers => ['[::1]:11211'])
+      }
+    end
+
+  end
+
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) do
+        facts.merge({ :hostname => 'node.example.com' })
+      end
+
+      it_behaves_like 'tripleo::profile::base::manila::authtoken'
+    end
+  end
+end
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index 6555b8b5d..48fad13d0 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -64,6 +64,7 @@ mysql_short_bootstrap_node_name: node
 # manila related items
 manila::rabbit_password: 'password'
 manila::backend::cephfs::cephfs_protocol_helper_type: 'NFS'
+manila::keystone::authtoken::password: 'password'
 manila_share_short_bootstrap_node_name: 'node.example.com'
 manila_share_short_node_names:
  - 'manila-1'