openstack/puppet-swift
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: I518cc1e80f870122ecff450f792f6a16ca56a9a3
This commit is contained in:
zhulingjie 2018-05-29 11:47:11 -04:00
parent 70295a2777
commit ecf9394d98
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/proxy/authtoken.pp
View File

@ -23,7 +23,7 @@
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (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*] # [*auth_plugin*]
# (Optional) The plugin for authentication # (Optional) The plugin for authentication
@ -90,7 +90,7 @@ class swift::proxy::authtoken(
$signing_dir = '/var/cache/swift', $signing_dir = '/var/cache/swift',
$cache = 'swift.cache', $cache = 'swift.cache',
$auth_uri = 'http://127.0.0.1:5000', $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', $auth_plugin = 'password',
$project_domain_id = 'default', $project_domain_id = 'default',
$user_domain_id = 'default', $user_domain_id = 'default',

4
manifests/proxy/ceilometer.pp
View File

@ -49,7 +49,7 @@
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (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*] # [*auth_type*]
# (Optional) The plugin for authentication # (Optional) The plugin for authentication
@ -149,7 +149,7 @@ class swift::proxy::ceilometer(
$nonblocking_notify = false, $nonblocking_notify = false,
$ignore_projects = ['services'], $ignore_projects = ['services'],
$auth_uri = 'http://127.0.0.1:5000', $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', $auth_type = 'password',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$user_domain_name = 'Default', $user_domain_name = 'Default',

4
manifests/proxy/s3token.pp
View File

@ -18,7 +18,7 @@
# #
# [*auth_uri*] # [*auth_uri*]
# (optional) The Keystone server uri # (optional) The Keystone server uri
# Defaults to http://127.0.0.1:35357 # Defaults to http://127.0.0.1:5000
# #
# == Dependencies # == Dependencies
# #
@ -36,7 +36,7 @@ class swift::proxy::s3token(
$auth_host = undef, $auth_host = undef,
$auth_port = undef, $auth_port = undef,
$auth_protocol = undef, $auth_protocol = undef,
$auth_uri = 'http://127.0.0.1:35357' $auth_uri = 'http://127.0.0.1:5000'
) { ) {
include ::swift::deps include ::swift::deps

12
spec/classes/swift_proxy_authtoken_spec.rb
View File

@ -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/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/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/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/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/project_domain_id').with_value('default') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/user_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/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/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/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/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/project_domain_id').with_value('default') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/user_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 describe "when identity_uri is set" do
let :params do let :params do
{ {
:identity_uri => 'https://foo.bar:35357/' :identity_uri => 'https://foo.bar:5000/'
} }
end 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 end
describe "when both auth_uri and identity_uri are set" do describe "when both auth_uri and identity_uri are set" do
let :params do let :params do
{ {
:auth_uri => 'https://foo.bar:5000/v2.0/', :auth_uri => 'https://foo.bar:5000/v2.0/',
:identity_uri => 'https://foo.bar:35357/' :identity_uri => 'https://foo.bar:5000/'
} }
end 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/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
end end

4
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -31,7 +31,7 @@ describe 'swift::proxy::ceilometer' do
:nonblocking_notify => true, :nonblocking_notify => true,
:ignore_projects => ['services'], :ignore_projects => ['services'],
:auth_uri => 'http://127.0.0.1:5000', :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', :auth_type => 'password',
:project_domain_name => 'Default', :project_domain_name => 'Default',
:user_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/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/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_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/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/project_domain_name').with_value('Default') }
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/user_domain_name').with_value('Default') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/user_domain_name').with_value('Default') }

6
spec/classes/swift_proxy_s3token_spec.rb
View File

@ -4,7 +4,7 @@ describe 'swift::proxy::s3token' do
shared_examples 'swift::proxy::s3token' do shared_examples 'swift::proxy::s3token' do
describe "when using default parameters" 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/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 end
describe "when overriding default parameters" do describe "when overriding default parameters" do
@ -22,11 +22,11 @@ describe 'swift::proxy::s3token' do
describe "when overriding default parameters" do describe "when overriding default parameters" do
let :params do let :params do
{ {
:auth_uri => 'http://192.168.24.11:35357' :auth_uri => 'http://192.168.24.11:5000'
} }
end 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
end end

2
tests/site.pp
View File

@ -245,7 +245,7 @@ node /swift-proxy/ {
class { '::swift::proxy::s3token': class { '::swift::proxy::s3token':
# assume that the controller host is the swift api server # assume that the controller host is the swift api server
auth_host => $swift_keystone_node, auth_host => $swift_keystone_node,
auth_port => '35357', auth_port => '5000',
} }
class { '::swift::proxy::keystone': class { '::swift::proxy::keystone':
operator_roles => ['admin', 'SwiftOperator'], operator_roles => ['admin', 'SwiftOperator'],