From 8b5f5dfb4e48f2ad477e58dfe027b32f85c319bb Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Tue, 29 May 2018 10:15:02 -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: Ib78b6826d1a98baeebf7455a3778555973e789bc --- manifests/ironic/common.pp | 4 ++-- manifests/keystone/authtoken.pp | 4 ++-- manifests/metadata/novajoin/api.pp | 4 ++-- manifests/metadata/novajoin/authtoken.pp | 4 ++-- manifests/network/neutron.pp | 4 ++-- manifests/placement.pp | 4 ++-- spec/classes/nova_ironic_common_spec.rb | 6 +++--- spec/classes/nova_keystone_authtoken_spec.rb | 4 ++-- spec/classes/nova_metadata_novajoin_api_spec.rb | 4 ++-- spec/classes/nova_metadata_novajoin_authtoken_spec.rb | 4 ++-- spec/classes/nova_network_neutron_spec.rb | 4 ++-- spec/classes/nova_placement_spec.rb | 4 ++-- spec/unit/provider/nova_aggregate/openstack_spec.rb | 2 +- spec/unit/provider/nova_security_rule/openstack_spec.rb | 2 +- spec/unit/provider/nova_service/openstack_spec.rb | 2 +- spec/unit/provider/nova_spec.rb | 4 ++-- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/manifests/ironic/common.pp b/manifests/ironic/common.pp index bac407274..2fe5b5f80 100644 --- a/manifests/ironic/common.pp +++ b/manifests/ironic/common.pp @@ -10,7 +10,7 @@ # # [*auth_url*] # The address of the Keystone api endpoint. -# Defaults to 'http://127.0.0.1:35357/' +# Defaults to 'http://127.0.0.1:5000/' # # [*project_name*] # The Ironic Keystone project name. @@ -41,7 +41,7 @@ class nova::ironic::common ( $api_endpoint = 'http://127.0.0.1:6385/v1', $auth_plugin = 'password', - $auth_url = 'http://127.0.0.1:35357/', + $auth_url = 'http://127.0.0.1:5000/', $password = 'ironic', $project_name = 'services', $username = 'admin', diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index d2bd8f867..2bf78a9d9 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -14,7 +14,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' # # [*project_name*] # (Optional) Service project name @@ -187,7 +187,7 @@ class nova::keystone::authtoken( $username = 'nova', $password = $::os_service_default, - $auth_url = 'http://127.0.0.1:35357/', + $auth_url = 'http://127.0.0.1:5000/', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/manifests/metadata/novajoin/api.pp b/manifests/metadata/novajoin/api.pp index 4302e024e..6cec556b3 100644 --- a/manifests/metadata/novajoin/api.pp +++ b/manifests/metadata/novajoin/api.pp @@ -62,7 +62,7 @@ # # [*keystone_auth_url*] # (optional) auth_url for the keystone instance. -# Defaults to 'http:://127.0.0.1:35357' +# Defaults to 'http:://127.0.0.1:5000' # # [*keytab*] # (optional) Kerberos client keytab file. @@ -115,7 +115,7 @@ class nova::metadata::novajoin::api ( $ensure_package = 'present', $ipa_domain = undef, $join_listen_port = $::os_service_default, - $keystone_auth_url = 'http://127.0.0.1:35357/', + $keystone_auth_url = 'http://127.0.0.1:5000/', $keytab = '/etc/novajoin/krb5.keytab', $log_dir = '/var/log/novajoin', $manage_service = true, diff --git a/manifests/metadata/novajoin/authtoken.pp b/manifests/metadata/novajoin/authtoken.pp index efa6ffca8..59e3f7c4a 100644 --- a/manifests/metadata/novajoin/authtoken.pp +++ b/manifests/metadata/novajoin/authtoken.pp @@ -14,7 +14,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' # # [*project_name*] # (Optional) Service project name @@ -187,7 +187,7 @@ class nova::metadata::novajoin::authtoken( $username = 'novajoin', $password = $::os_service_default, - $auth_url = 'http://127.0.0.1:35357/', + $auth_url = 'http://127.0.0.1:5000/', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index fbf0f9d0a..d2efbdcdb 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -57,7 +57,7 @@ # (optional) Points to the OpenStack Identity server IP and port. # This is the Identity (keystone) admin API server IP and port value, # and not the Identity service API IP and port. -# Defaults to 'http://127.0.0.1:35357/v3' +# Defaults to 'http://127.0.0.1:5000/v3' # # [*firewall_driver*] # (optional) Firewall driver. @@ -93,7 +93,7 @@ class nova::network::neutron ( $neutron_project_domain_name = 'Default', $neutron_username = 'neutron', $neutron_user_domain_name = 'Default', - $neutron_auth_url = 'http://127.0.0.1:35357/v3', + $neutron_auth_url = 'http://127.0.0.1:5000/v3', $neutron_url = 'http://127.0.0.1:9696', $neutron_url_timeout = '30', $neutron_region_name = 'RegionOne', diff --git a/manifests/placement.pp b/manifests/placement.pp index 0ad8c6a33..abbcd8b99 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -68,7 +68,7 @@ # (optional) Points to the OpenStack Identity server IP and port. # This is the Identity (keystone) admin API server IP and port value, # and not the Identity service API IP and port. -# Defaults to 'http://127.0.0.1:35357/v3' +# Defaults to 'http://127.0.0.1:5000/v3' # # DEPRECATED PARAMETERS # @@ -85,7 +85,7 @@ class nova::placement( $ensure_package = 'present', $password = false, $auth_type = 'password', - $auth_url = 'http://127.0.0.1:35357/v3', + $auth_url = 'http://127.0.0.1:5000/v3', $region_name = 'RegionOne', $os_interface = $::os_service_default, $project_domain_name = 'Default', diff --git a/spec/classes/nova_ironic_common_spec.rb b/spec/classes/nova_ironic_common_spec.rb index 358db7518..7c6447d3b 100644 --- a/spec/classes/nova_ironic_common_spec.rb +++ b/spec/classes/nova_ironic_common_spec.rb @@ -9,7 +9,7 @@ describe 'nova::ironic::common' do is_expected.to contain_nova_config('ironic/auth_plugin').with_value('password') is_expected.to contain_nova_config('ironic/username').with_value('admin') is_expected.to contain_nova_config('ironic/password').with_value('ironic') - is_expected.to contain_nova_config('ironic/auth_url').with_value('http://127.0.0.1:35357/') + is_expected.to contain_nova_config('ironic/auth_url').with_value('http://127.0.0.1:5000/') is_expected.to contain_nova_config('ironic/project_name').with_value('services') is_expected.to contain_nova_config('ironic/api_endpoint').with_value('http://127.0.0.1:6385/v1') is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '') @@ -25,7 +25,7 @@ describe 'nova::ironic::common' do { :username => 'ironic', :password => 's3cr3t', - :auth_url => 'http://10.0.0.10:35357/', + :auth_url => 'http://10.0.0.10:5000/', :project_name => 'services2', :api_endpoint => 'http://10.0.0.10:6385/v1', :api_max_retries => 60, @@ -39,7 +39,7 @@ describe 'nova::ironic::common' do is_expected.to contain_nova_config('ironic/auth_plugin').with_value('password') is_expected.to contain_nova_config('ironic/username').with_value('ironic') is_expected.to contain_nova_config('ironic/password').with_value('s3cr3t') - is_expected.to contain_nova_config('ironic/auth_url').with_value('http://10.0.0.10:35357/') + is_expected.to contain_nova_config('ironic/auth_url').with_value('http://10.0.0.10:5000/') is_expected.to contain_nova_config('ironic/project_name').with_value('services2') is_expected.to contain_nova_config('ironic/api_endpoint').with_value('http://10.0.0.10:6385/v1') is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '60') diff --git a/spec/classes/nova_keystone_authtoken_spec.rb b/spec/classes/nova_keystone_authtoken_spec.rb index d889209bd..d90c4417a 100644 --- a/spec/classes/nova_keystone_authtoken_spec.rb +++ b/spec/classes/nova_keystone_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'nova::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_nova_config('keystone_authtoken/username').with_value('nova') is_expected.to contain_nova_config('keystone_authtoken/password').with_value('nova_password') - is_expected.to contain_nova_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/') + is_expected.to contain_nova_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000/') is_expected.to contain_nova_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_nova_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_nova_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'nova::keystone::authtoken' do :www_authenticate_uri => 'https://10.0.0.1:9999/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'http://:127.0.0.1:35357', + :auth_url => 'http://:127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX', diff --git a/spec/classes/nova_metadata_novajoin_api_spec.rb b/spec/classes/nova_metadata_novajoin_api_spec.rb index 4c83bd9b9..baa2130c6 100644 --- a/spec/classes/nova_metadata_novajoin_api_spec.rb +++ b/spec/classes/nova_metadata_novajoin_api_spec.rb @@ -35,7 +35,7 @@ describe 'nova::metadata::novajoin::api' do :project_name => 'service', :user_domain_id => 'default', :ipa_domain => 'EXAMPLE.COM', - :keystone_auth_url => 'https://keystone.example.com:35357', + :keystone_auth_url => 'https://keystone.example.com:5000', :service_password => 'my_secret_password', :transport_url => 'rabbit:rabbit_pass@rabbit_host', } @@ -62,7 +62,7 @@ describe 'nova::metadata::novajoin::api' do :project_name => 'service', :user_domain_id => 'default', :ipa_domain => 'EXAMPLE2.COM', - :keystone_auth_url => 'https://keystone2.example.com:35357', + :keystone_auth_url => 'https://keystone2.example.com:5000', :service_password => 'my_secret_password2', :transport_url => 'rabbit:rabbit_pass2@rabbit_host', } diff --git a/spec/classes/nova_metadata_novajoin_authtoken_spec.rb b/spec/classes/nova_metadata_novajoin_authtoken_spec.rb index 10f16adee..6a5715f9a 100644 --- a/spec/classes/nova_metadata_novajoin_authtoken_spec.rb +++ b/spec/classes/nova_metadata_novajoin_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'nova::metadata::novajoin::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_novajoin_config('keystone_authtoken/username').with_value('novajoin') is_expected.to contain_novajoin_config('keystone_authtoken/password').with_value('novajoin_password') - is_expected.to contain_novajoin_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/') + is_expected.to contain_novajoin_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000/') is_expected.to contain_novajoin_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_novajoin_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_novajoin_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'nova::metadata::novajoin::authtoken' do :www_authenticate_uri => 'https://10.0.0.1:9999/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'http://:127.0.0.1:35357', + :auth_url => 'http://:127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX', diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb index c35a9e051..e583a353e 100644 --- a/spec/classes/nova_network_neutron_spec.rb +++ b/spec/classes/nova_network_neutron_spec.rb @@ -11,7 +11,7 @@ describe 'nova::network::neutron' do :neutron_region_name => 'RegionOne', :neutron_username => 'neutron', :neutron_user_domain_name => 'Default', - :neutron_auth_url => 'http://127.0.0.1:35357/v3', + :neutron_auth_url => 'http://127.0.0.1:5000/v3', :neutron_ovs_bridge => 'br-int', :neutron_extension_sync_interval => '600', :firewall_driver => 'nova.virt.firewall.NoopFirewallDriver', @@ -62,7 +62,7 @@ describe 'nova::network::neutron' do :neutron_region_name => 'RegionTwo', :neutron_username => 'neutron2', :neutron_user_domain_name => 'neutron_domain', - :neutron_auth_url => 'http://10.0.0.1:35357/v2', + :neutron_auth_url => 'http://10.0.0.1:5000/v2', :firewall_driver => 'nova.virt.firewall.IptablesFirewallDriver', :neutron_ovs_bridge => 'br-int', :neutron_extension_sync_interval => '600', diff --git a/spec/classes/nova_placement_spec.rb b/spec/classes/nova_placement_spec.rb index 1cd91fb9b..8dde4aa73 100644 --- a/spec/classes/nova_placement_spec.rb +++ b/spec/classes/nova_placement_spec.rb @@ -9,7 +9,7 @@ describe 'nova::placement' do :region_name => 'RegionOne', :username => 'placement', :user_domain_name => 'Default', - :auth_url => 'http://127.0.0.1:35357/v3', + :auth_url => 'http://127.0.0.1:5000/v3', } end @@ -43,7 +43,7 @@ describe 'nova::placement' do :os_interface => 'internal', :username => 'placement2', :user_domain_name => 'default', - :auth_url => 'https://127.0.0.1:35357/v3', + :auth_url => 'https://127.0.0.1:5000/v3', ) end diff --git a/spec/unit/provider/nova_aggregate/openstack_spec.rb b/spec/unit/provider/nova_aggregate/openstack_spec.rb index 78e2a1e41..005c6953b 100644 --- a/spec/unit/provider/nova_aggregate/openstack_spec.rb +++ b/spec/unit/provider/nova_aggregate/openstack_spec.rb @@ -10,7 +10,7 @@ describe provider_class do ENV['OS_USERNAME'] = 'test' ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PROJECT_NAME'] = 'test' - ENV['OS_AUTH_URL'] = 'http://127.0.0.1:35357/v3' + ENV['OS_AUTH_URL'] = 'http://127.0.0.1:5000/v3' end describe 'managing aggregates' do diff --git a/spec/unit/provider/nova_security_rule/openstack_spec.rb b/spec/unit/provider/nova_security_rule/openstack_spec.rb index b6f229dc3..1d3c78353 100644 --- a/spec/unit/provider/nova_security_rule/openstack_spec.rb +++ b/spec/unit/provider/nova_security_rule/openstack_spec.rb @@ -10,7 +10,7 @@ describe provider_class do ENV['OS_USERNAME'] = 'test' ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PROJECT_NAME'] = 'test' - ENV['OS_AUTH_URL'] = 'http://127.0.0.1:35357/v3' + ENV['OS_AUTH_URL'] = 'http://127.0.0.1:5000/v3' end describe 'managing security group rules' do diff --git a/spec/unit/provider/nova_service/openstack_spec.rb b/spec/unit/provider/nova_service/openstack_spec.rb index c99dba2d5..13311d110 100644 --- a/spec/unit/provider/nova_service/openstack_spec.rb +++ b/spec/unit/provider/nova_service/openstack_spec.rb @@ -10,7 +10,7 @@ describe provider_class do ENV['OS_USERNAME'] = 'test' ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PROJECT_NAME'] = 'test' - ENV['OS_AUTH_URL'] = 'http://127.0.0.1:35357/v3' + ENV['OS_AUTH_URL'] = 'http://127.0.0.1:5000/v3' end describe 'managing nova services' do diff --git a/spec/unit/provider/nova_spec.rb b/spec/unit/provider/nova_spec.rb index 68a3aa252..fb84e339f 100644 --- a/spec/unit/provider/nova_spec.rb +++ b/spec/unit/provider/nova_spec.rb @@ -11,7 +11,7 @@ describe Puppet::Provider::Nova do let :credential_hash do { - 'www_authenticate_uri' => 'https://192.168.56.210:35357/v2.0/', + 'www_authenticate_uri' => 'https://192.168.56.210:5000/v2.0/', 'project_name' => 'admin_tenant', 'username' => 'admin', 'password' => 'password', @@ -20,7 +20,7 @@ describe Puppet::Provider::Nova do end let :auth_endpoint do - 'https://192.168.56.210:35357/v2.0/' + 'https://192.168.56.210:5000/v2.0/' end let :credential_error do