openstack/puppet-nova
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: Ib78b6826d1a98baeebf7455a3778555973e789bc
This commit is contained in:
zhulingjie
2018-05-29 10:15:02 -04:00
parent 839d6eb334
commit 8b5f5dfb4e
16 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/ironic/common.pp
View File

@@ -10,7 +10,7 @@
# #
# [*auth_url*] # [*auth_url*]
# The address of the Keystone api endpoint. # 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*] # [*project_name*]
# The Ironic Keystone project name. # The Ironic Keystone project name.
@@ -41,7 +41,7 @@
class nova::ironic::common ( class nova::ironic::common (
$api_endpoint = 'http://127.0.0.1:6385/v1', $api_endpoint = 'http://127.0.0.1:6385/v1',
$auth_plugin = 'password', $auth_plugin = 'password',
$auth_url = 'http://127.0.0.1:35357/', $auth_url = 'http://127.0.0.1:5000/',
$password = 'ironic', $password = 'ironic',
$project_name = 'services', $project_name = 'services',
$username = 'admin', $username = 'admin',

4
manifests/keystone/authtoken.pp
View File

@@ -14,7 +14,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'
# #
# [*project_name*] # [*project_name*]
# (Optional) Service project name # (Optional) Service project name
@@ -187,7 +187,7 @@
class nova::keystone::authtoken( class nova::keystone::authtoken(
$username = 'nova', $username = 'nova',
$password = $::os_service_default, $password = $::os_service_default,
$auth_url = 'http://127.0.0.1:35357/', $auth_url = 'http://127.0.0.1:5000/',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',

4
manifests/metadata/novajoin/api.pp
View File

@@ -62,7 +62,7 @@
# #
# [*keystone_auth_url*] # [*keystone_auth_url*]
# (optional) auth_url for the keystone instance. # (optional) auth_url for the keystone instance.
# Defaults to 'http:://127.0.0.1:35357' # Defaults to 'http:://127.0.0.1:5000'
# #
# [*keytab*] # [*keytab*]
# (optional) Kerberos client keytab file. # (optional) Kerberos client keytab file.
@@ -115,7 +115,7 @@ class nova::metadata::novajoin::api (
$ensure_package = 'present', $ensure_package = 'present',
$ipa_domain = undef, $ipa_domain = undef,
$join_listen_port = $::os_service_default, $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', $keytab = '/etc/novajoin/krb5.keytab',
$log_dir = '/var/log/novajoin', $log_dir = '/var/log/novajoin',
$manage_service = true, $manage_service = true,

4
manifests/metadata/novajoin/authtoken.pp
View File

@@ -14,7 +14,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'
# #
# [*project_name*] # [*project_name*]
# (Optional) Service project name # (Optional) Service project name
@@ -187,7 +187,7 @@
class nova::metadata::novajoin::authtoken( class nova::metadata::novajoin::authtoken(
$username = 'novajoin', $username = 'novajoin',
$password = $::os_service_default, $password = $::os_service_default,
$auth_url = 'http://127.0.0.1:35357/', $auth_url = 'http://127.0.0.1:5000/',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',

4
manifests/network/neutron.pp
View File

@@ -57,7 +57,7 @@
# (optional) Points to the OpenStack Identity server IP and port. # (optional) Points to the OpenStack Identity server IP and port.
# This is the Identity (keystone) admin API server IP and port value, # This is the Identity (keystone) admin API server IP and port value,
# and not the Identity service API IP and port. # 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*] # [*firewall_driver*]
# (optional) Firewall driver. # (optional) Firewall driver.
@@ -93,7 +93,7 @@ class nova::network::neutron (
$neutron_project_domain_name = 'Default', $neutron_project_domain_name = 'Default',
$neutron_username = 'neutron', $neutron_username = 'neutron',
$neutron_user_domain_name = 'Default', $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 = 'http://127.0.0.1:9696',
$neutron_url_timeout = '30', $neutron_url_timeout = '30',
$neutron_region_name = 'RegionOne', $neutron_region_name = 'RegionOne',

4
manifests/placement.pp
View File

@@ -68,7 +68,7 @@
# (optional) Points to the OpenStack Identity server IP and port. # (optional) Points to the OpenStack Identity server IP and port.
# This is the Identity (keystone) admin API server IP and port value, # This is the Identity (keystone) admin API server IP and port value,
# and not the Identity service API IP and port. # 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 # DEPRECATED PARAMETERS
# #
@@ -85,7 +85,7 @@ class nova::placement(
$ensure_package = 'present', $ensure_package = 'present',
$password = false, $password = false,
$auth_type = 'password', $auth_type = 'password',
$auth_url = 'http://127.0.0.1:35357/v3', $auth_url = 'http://127.0.0.1:5000/v3',
$region_name = 'RegionOne', $region_name = 'RegionOne',
$os_interface = $::os_service_default, $os_interface = $::os_service_default,
$project_domain_name = 'Default', $project_domain_name = 'Default',

6
spec/classes/nova_ironic_common_spec.rb
View File

@@ -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/auth_plugin').with_value('password')
is_expected.to contain_nova_config('ironic/username').with_value('admin') 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/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/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_endpoint').with_value('http://127.0.0.1:6385/v1')
is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '<SERVICE DEFAULT>') is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '<SERVICE DEFAULT>')
@@ -25,7 +25,7 @@ describe 'nova::ironic::common' do
{ {
:username => 'ironic', :username => 'ironic',
:password => 's3cr3t', :password => 's3cr3t',
:auth_url => 'http://10.0.0.10:35357/', :auth_url => 'http://10.0.0.10:5000/',
:project_name => 'services2', :project_name => 'services2',
:api_endpoint => 'http://10.0.0.10:6385/v1', :api_endpoint => 'http://10.0.0.10:6385/v1',
:api_max_retries => 60, :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/auth_plugin').with_value('password')
is_expected.to contain_nova_config('ironic/username').with_value('ironic') 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/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/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_endpoint').with_value('http://10.0.0.10:6385/v1')
is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '60') is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '60')

4
spec/classes/nova_keystone_authtoken_spec.rb
View File

@@ -13,7 +13,7 @@ describe 'nova::keystone::authtoken' do
it 'configure 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/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/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/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/user_domain_name').with_value('Default')
is_expected.to contain_nova_config('keystone_authtoken/project_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/', :www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser', :username => 'myuser',
:password => 'mypasswd', :password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357', :auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project', :project_name => 'service_project',
:user_domain_name => 'domainX', :user_domain_name => 'domainX',
:project_domain_name => 'domainX', :project_domain_name => 'domainX',

4
spec/classes/nova_metadata_novajoin_api_spec.rb
View File

@@ -35,7 +35,7 @@ describe 'nova::metadata::novajoin::api' do
:project_name => 'service', :project_name => 'service',
:user_domain_id => 'default', :user_domain_id => 'default',
:ipa_domain => 'EXAMPLE.COM', :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', :service_password => 'my_secret_password',
:transport_url => 'rabbit:rabbit_pass@rabbit_host', :transport_url => 'rabbit:rabbit_pass@rabbit_host',
} }
@@ -62,7 +62,7 @@ describe 'nova::metadata::novajoin::api' do
:project_name => 'service', :project_name => 'service',
:user_domain_id => 'default', :user_domain_id => 'default',
:ipa_domain => 'EXAMPLE2.COM', :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', :service_password => 'my_secret_password2',
:transport_url => 'rabbit:rabbit_pass2@rabbit_host', :transport_url => 'rabbit:rabbit_pass2@rabbit_host',
} }

4
spec/classes/nova_metadata_novajoin_authtoken_spec.rb
View File

@@ -13,7 +13,7 @@ describe 'nova::metadata::novajoin::authtoken' do
it 'configure keystone_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/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/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/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/user_domain_name').with_value('Default')
is_expected.to contain_novajoin_config('keystone_authtoken/project_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/', :www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser', :username => 'myuser',
:password => 'mypasswd', :password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357', :auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project', :project_name => 'service_project',
:user_domain_name => 'domainX', :user_domain_name => 'domainX',
:project_domain_name => 'domainX', :project_domain_name => 'domainX',

4
spec/classes/nova_network_neutron_spec.rb
View File

@@ -11,7 +11,7 @@ describe 'nova::network::neutron' do
:neutron_region_name => 'RegionOne', :neutron_region_name => 'RegionOne',
:neutron_username => 'neutron', :neutron_username => 'neutron',
:neutron_user_domain_name => 'Default', :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_ovs_bridge => 'br-int',
:neutron_extension_sync_interval => '600', :neutron_extension_sync_interval => '600',
:firewall_driver => 'nova.virt.firewall.NoopFirewallDriver', :firewall_driver => 'nova.virt.firewall.NoopFirewallDriver',
@@ -62,7 +62,7 @@ describe 'nova::network::neutron' do
:neutron_region_name => 'RegionTwo', :neutron_region_name => 'RegionTwo',
:neutron_username => 'neutron2', :neutron_username => 'neutron2',
:neutron_user_domain_name => 'neutron_domain', :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', :firewall_driver => 'nova.virt.firewall.IptablesFirewallDriver',
:neutron_ovs_bridge => 'br-int', :neutron_ovs_bridge => 'br-int',
:neutron_extension_sync_interval => '600', :neutron_extension_sync_interval => '600',

4
spec/classes/nova_placement_spec.rb
View File

@@ -9,7 +9,7 @@ describe 'nova::placement' do
:region_name => 'RegionOne', :region_name => 'RegionOne',
:username => 'placement', :username => 'placement',
:user_domain_name => 'Default', :user_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:35357/v3', :auth_url => 'http://127.0.0.1:5000/v3',
} }
end end
@@ -43,7 +43,7 @@ describe 'nova::placement' do
:os_interface => 'internal', :os_interface => 'internal',
:username => 'placement2', :username => 'placement2',
:user_domain_name => 'default', :user_domain_name => 'default',
:auth_url => 'https://127.0.0.1:35357/v3', :auth_url => 'https://127.0.0.1:5000/v3',
) )
end end

2
spec/unit/provider/nova_aggregate/openstack_spec.rb
View File

@@ -10,7 +10,7 @@ describe provider_class do
ENV['OS_USERNAME'] = 'test' ENV['OS_USERNAME'] = 'test'
ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PASSWORD'] = 'abc123'
ENV['OS_PROJECT_NAME'] = 'test' 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 end
describe 'managing aggregates' do describe 'managing aggregates' do

2
spec/unit/provider/nova_security_rule/openstack_spec.rb
View File

@@ -10,7 +10,7 @@ describe provider_class do
ENV['OS_USERNAME'] = 'test' ENV['OS_USERNAME'] = 'test'
ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PASSWORD'] = 'abc123'
ENV['OS_PROJECT_NAME'] = 'test' 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 end
describe 'managing security group rules' do describe 'managing security group rules' do

2
spec/unit/provider/nova_service/openstack_spec.rb
View File

@@ -10,7 +10,7 @@ describe provider_class do
ENV['OS_USERNAME'] = 'test' ENV['OS_USERNAME'] = 'test'
ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PASSWORD'] = 'abc123'
ENV['OS_PROJECT_NAME'] = 'test' 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 end
describe 'managing nova services' do describe 'managing nova services' do

4
spec/unit/provider/nova_spec.rb
View File

@@ -11,7 +11,7 @@ describe Puppet::Provider::Nova do
let :credential_hash 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', 'project_name' => 'admin_tenant',
'username' => 'admin', 'username' => 'admin',
'password' => 'password', 'password' => 'password',
@@ -20,7 +20,7 @@ describe Puppet::Provider::Nova do
end end
let :auth_endpoint do let :auth_endpoint do
'https://192.168.56.210:35357/v2.0/' 'https://192.168.56.210:5000/v2.0/'
end end
let :credential_error do let :credential_error do