openstack/puppet-murano
Code Issues Proposed changes

Replace port 35357 with 5000

Browse Source 
Now that the v2.0 API has been removed, we don't have a reason to
include deployment instructions for two separate applications on
different ports.

Change-Id: I98d5acb9ebc3f6d2dfe04fcaaf3c273968c99291
This commit is contained in:
qiaomin 2018-05-13 00:53:36 +08:00
parent 89883ce734
commit 3f2c9c17c9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -265,7 +265,7 @@
#
# [*identity_uri*]
# (Optional) Admin identity endpoint
# Defaults to 'http://127.0.0.1:35357/'
# Defaults to 'http://127.0.0.1:5000/'
#
# [*rabbit_os_host*]
# (Optional) Host for openstack rabbit server
@ -352,7 +352,7 @@ class murano(
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
# Deprecated
$identity_uri = 'http://127.0.0.1:35357/',
$identity_uri = 'http://127.0.0.1:5000/',
$rabbit_os_host = $::os_service_default,
$rabbit_os_port = $::os_service_default,
$rabbit_os_hosts = $::os_service_default,

6
spec/classes/murano_init_spec.rb
View File

@ -73,7 +73,7 @@ describe 'murano' do
it { is_expected.to contain_murano_config('keystone_authtoken/username').with_value('murano') }
it { is_expected.to contain_murano_config('keystone_authtoken/project_name').with_value('services') }
it { is_expected.to contain_murano_config('keystone_authtoken/password').with_value('secrete') }
it { is_expected.not_to contain_murano_config('keystone_authtoken/auth_url').with_value('http://10.255.0.1:35357/') }
it { is_expected.not_to contain_murano_config('keystone_authtoken/auth_url').with_value('http://10.255.0.1:5000/') }
it { is_expected.to contain_murano_config('keystone_authtoken/user_domain_name').with_value('Default') }
it { is_expected.to contain_murano_config('keystone_authtoken/project_domain_name').with_value('Default') }
it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>') }
@ -123,7 +123,7 @@ describe 'murano' do
:admin_user => 'muranoy',
:admin_tenant_name => 'secrete',
:auth_uri => 'http://10.255.0.1:5000/v2.0/',
:identity_uri => 'http://10.255.0.1:35357/',
:identity_uri => 'http://10.255.0.1:5000/',
:user_domain_name => 'new_domain',
:project_domain_name => 'new_domain',
:kombu_reconnect_delay => '1.0',
@ -178,7 +178,7 @@ describe 'murano' do
it { is_expected.to contain_murano_config('keystone_authtoken/auth_uri').with_value('http://10.255.0.1:5000/v2.0/') }
it { is_expected.to contain_murano_config('keystone_authtoken/username').with_value('muranoy') }
it { is_expected.to contain_murano_config('keystone_authtoken/project_name').with_value('secrete') }
it { is_expected.to contain_murano_config('keystone_authtoken/auth_url').with_value('http://10.255.0.1:35357/') }
it { is_expected.to contain_murano_config('keystone_authtoken/auth_url').with_value('http://10.255.0.1:5000/') }
it { is_expected.to contain_murano_config('keystone_authtoken/password').with_value('secrete') }
it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('1.1.1.1:11211') }
it { is_expected.to contain_murano_config('keystone_authtoken/user_domain_name').with_value('new_domain') }

8
spec/unit/provider/murano_spec.rb
View File

@ -11,7 +11,7 @@ describe Puppet::Provider::Murano do
let :credential_hash do
{
'auth_uri' => 'https://192.168.56.210:35357',
'auth_uri' => 'https://192.168.56.210:5000',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
@ -78,7 +78,7 @@ describe Puppet::Provider::Murano do
it 'should read auth credentials with specified package service' do
mock = {
'keystone_authtoken' => {
'auth_uri' => 'https://192.168.56.210:35357',
'auth_uri' => 'https://192.168.56.210:5000',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
@ -88,7 +88,7 @@ describe Puppet::Provider::Murano do
}
}
creds = {
'auth_uri' => 'https://192.168.56.210:35357',
'auth_uri' => 'https://192.168.56.210:5000',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
@ -103,7 +103,7 @@ describe Puppet::Provider::Murano do
it 'should set auth env credentials with specified package service' do
creds = {
'auth_uri' => 'https://192.168.56.210:35357',
'auth_uri' => 'https://192.168.56.210:5000',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',