From ecf9394d989fc7cfec7fe99ae39d9e906b6dbb55 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Tue, 29 May 2018 11:47:11 -0400 Subject: [PATCH] Replace port 35357 with 5000 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: I518cc1e80f870122ecff450f792f6a16ca56a9a3 --- manifests/proxy/authtoken.pp | 4 ++-- manifests/proxy/ceilometer.pp | 4 ++-- manifests/proxy/s3token.pp | 4 ++-- spec/classes/swift_proxy_authtoken_spec.rb | 12 ++++++------ spec/classes/swift_proxy_ceilometer_spec.rb | 4 ++-- spec/classes/swift_proxy_s3token_spec.rb | 6 +++--- tests/site.pp | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/manifests/proxy/authtoken.pp b/manifests/proxy/authtoken.pp index d7febeb1..a4d9e389 100644 --- a/manifests/proxy/authtoken.pp +++ b/manifests/proxy/authtoken.pp @@ -23,7 +23,7 @@ # # [*auth_url*] # (Optional) The URL to use for authentication. -# Defaults to 'http://127.0.0.1:35357' +# Defaults to 'http://127.0.0.1:5000' # # [*auth_plugin*] # (Optional) The plugin for authentication @@ -90,7 +90,7 @@ class swift::proxy::authtoken( $signing_dir = '/var/cache/swift', $cache = 'swift.cache', $auth_uri = 'http://127.0.0.1:5000', - $auth_url = 'http://127.0.0.1:35357', + $auth_url = 'http://127.0.0.1:5000', $auth_plugin = 'password', $project_domain_id = 'default', $user_domain_id = 'default', diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp index fdb96b0d..0b584633 100644 --- a/manifests/proxy/ceilometer.pp +++ b/manifests/proxy/ceilometer.pp @@ -49,7 +49,7 @@ # # [*auth_url*] # (Optional) The URL to use for authentication. -# Defaults to 'http://127.0.0.1:35357' +# Defaults to 'http://127.0.0.1:5000' # # [*auth_type*] # (Optional) The plugin for authentication @@ -149,7 +149,7 @@ class swift::proxy::ceilometer( $nonblocking_notify = false, $ignore_projects = ['services'], $auth_uri = 'http://127.0.0.1:5000', - $auth_url = 'http://127.0.0.1:35357', + $auth_url = 'http://127.0.0.1:5000', $auth_type = 'password', $project_domain_name = 'Default', $user_domain_name = 'Default', diff --git a/manifests/proxy/s3token.pp b/manifests/proxy/s3token.pp index 6293994b..791ddbf9 100644 --- a/manifests/proxy/s3token.pp +++ b/manifests/proxy/s3token.pp @@ -18,7 +18,7 @@ # # [*auth_uri*] # (optional) The Keystone server uri -# Defaults to http://127.0.0.1:35357 +# Defaults to http://127.0.0.1:5000 # # == Dependencies # @@ -36,7 +36,7 @@ class swift::proxy::s3token( $auth_host = undef, $auth_port = undef, $auth_protocol = undef, - $auth_uri = 'http://127.0.0.1:35357' + $auth_uri = 'http://127.0.0.1:5000' ) { include ::swift::deps diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb index 8d1e1d44..36e59dd8 100644 --- a/spec/classes/swift_proxy_authtoken_spec.rb +++ b/spec/classes/swift_proxy_authtoken_spec.rb @@ -22,7 +22,7 @@ describe 'swift::proxy::authtoken' do it { is_expected.to contain_swift_proxy_config('filter:authtoken/signing_dir').with_value('/var/cache/swift') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/paste.filter_factory').with_value('keystonemiddleware.auth_token:filter_factory') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('http://127.0.0.1:5000') } - it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('http://127.0.0.1:35357') } + it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('http://127.0.0.1:5000') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_value('password') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/project_domain_id').with_value('default') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/user_domain_id').with_value('default') } @@ -50,7 +50,7 @@ describe 'swift::proxy::authtoken' do it { is_expected.to contain_swift_proxy_config('filter:authtoken/signing_dir').with_value('/home/swift/keystone-signing') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/paste.filter_factory').with_value('keystonemiddleware.auth_token:filter_factory') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('http://127.0.0.1:5000') } - it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('http://127.0.0.1:35357') } + it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('http://127.0.0.1:5000') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_value('password') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/project_domain_id').with_value('default') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/user_domain_id').with_value('default') } @@ -73,23 +73,23 @@ describe 'swift::proxy::authtoken' do describe "when identity_uri is set" do let :params do { - :identity_uri => 'https://foo.bar:35357/' + :identity_uri => 'https://foo.bar:5000/' } end - it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:35357/') } + it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:5000/') } end describe "when both auth_uri and identity_uri are set" do let :params do { :auth_uri => 'https://foo.bar:5000/v2.0/', - :identity_uri => 'https://foo.bar:35357/' + :identity_uri => 'https://foo.bar:5000/' } end it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('https://foo.bar:5000/v2.0/') } - it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:35357/') } + it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:5000/') } end end diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb index 77e95b0c..f80e0866 100644 --- a/spec/classes/swift_proxy_ceilometer_spec.rb +++ b/spec/classes/swift_proxy_ceilometer_spec.rb @@ -31,7 +31,7 @@ describe 'swift::proxy::ceilometer' do :nonblocking_notify => true, :ignore_projects => ['services'], :auth_uri => 'http://127.0.0.1:5000', - :auth_url => 'http://127.0.0.1:35357', + :auth_url => 'http://127.0.0.1:5000', :auth_type => 'password', :project_domain_name => 'Default', :user_domain_name => 'Default', @@ -51,7 +51,7 @@ describe 'swift::proxy::ceilometer' do it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('true') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/ignore_projects').with_value(['services']) } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_uri').with_value('http://127.0.0.1:5000') } - it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_url').with_value('http://127.0.0.1:35357') } + it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_url').with_value('http://127.0.0.1:5000') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_type').with_value('password') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/project_domain_name').with_value('Default') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/user_domain_name').with_value('Default') } diff --git a/spec/classes/swift_proxy_s3token_spec.rb b/spec/classes/swift_proxy_s3token_spec.rb index 9b9713df..9b2c274f 100644 --- a/spec/classes/swift_proxy_s3token_spec.rb +++ b/spec/classes/swift_proxy_s3token_spec.rb @@ -4,7 +4,7 @@ describe 'swift::proxy::s3token' do shared_examples 'swift::proxy::s3token' do describe "when using default parameters" do it { is_expected.to contain_swift_proxy_config('filter:s3token/use').with_value('egg:swift#s3token') } - it { is_expected.to contain_swift_proxy_config('filter:s3token/auth_uri').with_value('http://127.0.0.1:35357') } + it { is_expected.to contain_swift_proxy_config('filter:s3token/auth_uri').with_value('http://127.0.0.1:5000') } end describe "when overriding default parameters" do @@ -22,11 +22,11 @@ describe 'swift::proxy::s3token' do describe "when overriding default parameters" do let :params do { - :auth_uri => 'http://192.168.24.11:35357' + :auth_uri => 'http://192.168.24.11:5000' } end - it { is_expected.to contain_swift_proxy_config('filter:s3token/auth_uri').with_value('http://192.168.24.11:35357') } + it { is_expected.to contain_swift_proxy_config('filter:s3token/auth_uri').with_value('http://192.168.24.11:5000') } end end diff --git a/tests/site.pp b/tests/site.pp index e1a38af0..e847214a 100644 --- a/tests/site.pp +++ b/tests/site.pp @@ -245,7 +245,7 @@ node /swift-proxy/ { class { '::swift::proxy::s3token': # assume that the controller host is the swift api server auth_host => $swift_keystone_node, - auth_port => '35357', + auth_port => '5000', } class { '::swift::proxy::keystone': operator_roles => ['admin', 'SwiftOperator'],