From 0430a78f8a60bb9540280446685c39e56ddbfe68 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 9 Jun 2017 16:48:12 +0200 Subject: [PATCH] Add manifest ironic::cinder for configuring access to the volume service This is the part of ongoing boot-from-volume work. Change-Id: I2f0eb779b711e57f1532b1227896542d0ecffc89 Related-Bug: #1559691 --- manifests/cinder.pp | 62 ++++++++++++++ .../cinder-manifest-7176a14b96b3daab.yaml | 4 + spec/classes/ironic_cinder_spec.rb | 84 +++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 manifests/cinder.pp create mode 100644 releasenotes/notes/cinder-manifest-7176a14b96b3daab.yaml create mode 100644 spec/classes/ironic_cinder_spec.rb diff --git a/manifests/cinder.pp b/manifests/cinder.pp new file mode 100644 index 00000000..b2c412e1 --- /dev/null +++ b/manifests/cinder.pp @@ -0,0 +1,62 @@ +# 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::cinder +# +# [*auth_type*] +# The authentication plugin to use when connecting to cinder. +# 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 cinder. +# Defaults to 'ironic'. +# +# [*password*] +# The admin password for ironic to connect to cinder. +# Defaults to $::os_service_default +# +# [*user_domain_name*] +# The name of user's domain (required for Identity V3). +# Defaults to $::os_service_default +# +# [*project_domain_name*] +# The name of project's domain (required for Identity V3). +# Defaults to $::os_service_default +# +class ironic::cinder ( + $auth_type = 'password', + $auth_url = $::os_service_default, + $project_name = 'services', + $username = 'ironic', + $password = $::os_service_default, + $user_domain_name = $::os_service_default, + $project_domain_name = $::os_service_default, +) { + + ironic_config { + 'cinder/auth_type': value => $auth_type; + 'cinder/username': value => $username; + 'cinder/password': value => $password, secret => true; + 'cinder/auth_url': value => $auth_url; + 'cinder/project_name': value => $project_name; + 'cinder/user_domain_name': value => $user_domain_name; + 'cinder/project_domain_name': value => $project_domain_name; + } +} diff --git a/releasenotes/notes/cinder-manifest-7176a14b96b3daab.yaml b/releasenotes/notes/cinder-manifest-7176a14b96b3daab.yaml new file mode 100644 index 00000000..3406db0c --- /dev/null +++ b/releasenotes/notes/cinder-manifest-7176a14b96b3daab.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + New manifest "ironic::cinder" to set parameters for connecting to cinder. diff --git a/spec/classes/ironic_cinder_spec.rb b/spec/classes/ironic_cinder_spec.rb new file mode 100644 index 00000000..742a3038 --- /dev/null +++ b/spec/classes/ironic_cinder_spec.rb @@ -0,0 +1,84 @@ +# 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::cinder +# + +require 'spec_helper' + +describe 'ironic::cinder' do + + let :default_params do + { :auth_type => 'password', + :project_name => 'services', + :username => 'ironic', + } + end + + let :params do + {} + end + + shared_examples_for 'ironic cinder configuration' do + let :p do + default_params.merge(params) + end + + it 'configures ironic.conf' do + is_expected.to contain_ironic_config('cinder/auth_type').with_value(p[:auth_type]) + is_expected.to contain_ironic_config('cinder/auth_url').with_value('') + is_expected.to contain_ironic_config('cinder/project_name').with_value(p[:project_name]) + is_expected.to contain_ironic_config('cinder/username').with_value(p[:username]) + is_expected.to contain_ironic_config('cinder/password').with_value('').with_secret(true) + is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('') + is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('') + 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', + :user_domain_name => 'NonDefault', + :project_domain_name => 'NonDefault', + ) + end + + it 'should replace default parameter with new value' do + is_expected.to contain_ironic_config('cinder/auth_type').with_value(p[:auth_type]) + is_expected.to contain_ironic_config('cinder/auth_url').with_value(p[:auth_url]) + is_expected.to contain_ironic_config('cinder/project_name').with_value(p[:project_name]) + is_expected.to contain_ironic_config('cinder/username').with_value(p[:username]) + is_expected.to contain_ironic_config('cinder/password').with_value(p[:password]).with_secret(true) + is_expected.to contain_ironic_config('cinder/user_domain_name').with_value(p[:user_domain_name]) + is_expected.to contain_ironic_config('cinder/project_domain_name').with_value(p[:project_domain_name]) + 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 cinder configuration' + end + end + +end