openstack/puppet-mistral
Code Issues Proposed changes

Merge "The workflow service type should be workflowv2"

Browse Source
This commit is contained in:
Jenkins 2016-01-25 13:44:35 +00:00 committed by Gerrit Code Review
commit 62d274cd4c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/keystone/auth.pp
View File

@ -24,7 +24,7 @@
# Defaults to 'true'.
#
# [*service_type*]
# Type of service. Defaults to 'workflow'.
# Type of service. Defaults to 'workflowv2'.
#
# [*public_url*]
# (optional) The endpoint's public url.
@ -111,7 +111,7 @@ class mistral::keystone::auth(
$email = 'mistral@localhost',
$auth_name = 'mistral',
$service_name = undef,
$service_type = 'workflow',
$service_type = 'workflowv2',
$public_url = 'http://127.0.0.1:8989/v2',
$admin_url = 'http://127.0.0.1:8989/v2',
$internal_url = 'http://127.0.0.1:8989/v2',

16
spec/classes/mistral_keystone_auth_spec.rb
View File

@ -26,12 +26,12 @@ describe 'mistral::keystone::auth' do
:roles => ['admin']
)}
it { is_expected.to contain_keystone_service('mistral::workflow').with(
it { is_expected.to contain_keystone_service('mistral::workflowv2').with(
:ensure => 'present',
:description => 'Openstack workflow Service'
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/mistral::workflow').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/mistral::workflowv2').with(
:ensure => 'present',
:public_url => "http://127.0.0.1:8989/v2",
:admin_url => "http://127.0.0.1:8989/v2",
@ -47,8 +47,8 @@ describe 'mistral::keystone::auth' do
it { is_expected.to contain_keystone_user('mistraly') }
it { is_expected.to contain_keystone_user_role('mistraly@services') }
it { is_expected.to contain_keystone_service('mistraly::workflow') }
it { is_expected.to contain_keystone_endpoint('RegionOne/mistraly::workflow') }
it { is_expected.to contain_keystone_service('mistraly::workflowv2') }
it { is_expected.to contain_keystone_endpoint('RegionOne/mistraly::workflowv2') }
end
describe 'when overriding service name' do
@ -60,8 +60,8 @@ describe 'mistral::keystone::auth' do
it { is_expected.to contain_keystone_user('mistral') }
it { is_expected.to contain_keystone_user_role('mistral@services') }
it { is_expected.to contain_keystone_service('mistral_service::workflow') }
it { is_expected.to contain_keystone_endpoint('RegionOne/mistral_service::workflow') }
it { is_expected.to contain_keystone_service('mistral_service::workflowv2') }
it { is_expected.to contain_keystone_endpoint('RegionOne/mistral_service::workflowv2') }
end
describe 'when disabling user configuration' do
@ -75,7 +75,7 @@ describe 'mistral::keystone::auth' do
it { is_expected.not_to contain_keystone_user('mistral') }
it { is_expected.to contain_keystone_user_role('mistral@services') }
it { is_expected.to contain_keystone_service('mistral::workflow').with(
it { is_expected.to contain_keystone_service('mistral::workflowv2').with(
:ensure => 'present',
:description => 'Openstack workflow Service'
) }
@ -94,7 +94,7 @@ describe 'mistral::keystone::auth' do
it { is_expected.not_to contain_keystone_user('mistral') }
it { is_expected.not_to contain_keystone_user_role('mistral@services') }
it { is_expected.to contain_keystone_service('mistral::workflow').with(
it { is_expected.to contain_keystone_service('mistral::workflowv2').with(
:ensure => 'present',
:description => 'Openstack workflow Service'
) }