From 57e997515bd545659f0e25346e38748911e1a246 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 7 Feb 2017 17:06:23 +0100 Subject: [PATCH] Add separate manifest for configuring access to swift Without these parameters ironic uses keystone_authtoken credentials. This is deprecated since Newton and can be removed at any moment. Change-Id: I072cd20c7027ceb9aa0260428d6df136a25263eb Partial-Bug: #1661250 --- manifests/swift.pp | 50 ++++++++++++ .../swift-manifest-3e64c5cf13de40e7.yaml | 7 ++ spec/classes/ironic_swift_spec.rb | 78 +++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 manifests/swift.pp create mode 100644 releasenotes/notes/swift-manifest-3e64c5cf13de40e7.yaml create mode 100644 spec/classes/ironic_swift_spec.rb diff --git a/manifests/swift.pp b/manifests/swift.pp new file mode 100644 index 00000000..79a4107a --- /dev/null +++ b/manifests/swift.pp @@ -0,0 +1,50 @@ +# 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: ironic::swift +# +# [*auth_type*] +# The authentication plugin to use when connecting to swift. +# Defaults to 'password' +# +# [*auth_url*] +# The address of the keystone api endpoint. +# Defaults to $::os_service_default +# +# [*project_name*] +# The Keystone project name. +# Defaults to 'services' +# +# [*username*] +# The admin username for ironic to connect to swift. +# Defaults to 'ironic'. +# +# [*password*] +# The admin password for ironic to connect to swift. +# Defaults to $::os_service_default +# +class ironic::swift ( + $auth_type = 'password', + $auth_url = $::os_service_default, + $project_name = 'services', + $username = 'ironic', + $password = $::os_service_default, +) { + + ironic_config { + 'swift/auth_type': value => $auth_type; + 'swift/username': value => $username; + 'swift/password': value => $password, secret => true; + 'swift/auth_url': value => $auth_url; + 'swift/project_name': value => $project_name; + } +} diff --git a/releasenotes/notes/swift-manifest-3e64c5cf13de40e7.yaml b/releasenotes/notes/swift-manifest-3e64c5cf13de40e7.yaml new file mode 100644 index 00000000..c90a290e --- /dev/null +++ b/releasenotes/notes/swift-manifest-3e64c5cf13de40e7.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + New manifest "ironic::swift" to set parameters for connecting to swift. + Please set credentials for ironic to access swift using this manifest, + otherwise ironic falls back to using "keystone_authtoken" credentials, + which are deprecated for this purpose. diff --git a/spec/classes/ironic_swift_spec.rb b/spec/classes/ironic_swift_spec.rb new file mode 100644 index 00000000..0ed0773b --- /dev/null +++ b/spec/classes/ironic_swift_spec.rb @@ -0,0 +1,78 @@ +# 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. +# +# Unit tests for ironic::swift +# + +require 'spec_helper' + +describe 'ironic::swift' do + + let :default_params do + { :auth_type => 'password', + :project_name => 'services', + :username => 'ironic', + } + end + + let :params do + {} + end + + shared_examples_for 'ironic swift configuration' do + let :p do + default_params.merge(params) + end + + it 'configures ironic.conf' do + is_expected.to contain_ironic_config('swift/auth_type').with_value(p[:auth_type]) + is_expected.to contain_ironic_config('swift/auth_url').with_value('') + is_expected.to contain_ironic_config('swift/project_name').with_value(p[:project_name]) + is_expected.to contain_ironic_config('swift/username').with_value(p[:username]) + is_expected.to contain_ironic_config('swift/password').with_value('').with_secret(true) + end + + context 'when overriding parameters' do + before :each do + params.merge!( + :auth_type => 'noauth', + :auth_url => 'http://example.com', + :project_name => 'project1', + :username => 'admin', + :password => 'pa$$w0rd', + ) + end + + it 'should replace default parameter with new value' do + is_expected.to contain_ironic_config('swift/auth_type').with_value(p[:auth_type]) + is_expected.to contain_ironic_config('swift/auth_url').with_value(p[:auth_url]) + is_expected.to contain_ironic_config('swift/project_name').with_value(p[:project_name]) + is_expected.to contain_ironic_config('swift/username').with_value(p[:username]) + is_expected.to contain_ironic_config('swift/password').with_value(p[:password]).with_secret(true) + end + end + + end + + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| + context "on #{os}" do + let (:facts) do + facts.merge!(OSDefaults.get_facts()) + end + + it_behaves_like 'ironic swift configuration' + end + end + +end