From efe3daa2b6170aee83ddf134873d1cf8bea6a23e Mon Sep 17 00:00:00 2001
From: zhangzs <zhangzhaoshan@inspur.com>
Date: Tue, 19 Jun 2018 19:23:52 +0800
Subject: [PATCH] Replace port 35357 with 5000 for "auth_url"

Change-Id: Ieb2e00396d42fc1389af6f562d26ec85067203c9
---
 manifests/agents/ml2/networking_baremetal.pp             | 4 ++--
 manifests/keystone/authtoken.pp                          | 4 ++--
 manifests/plugins/cisco.pp                               | 4 ++--
 manifests/server/notifications.pp                        | 4 ++--
 manifests/server/placement.pp                            | 4 ++--
 .../neutron_agents_ml2_networking_baremetal_spec.rb      | 2 +-
 spec/classes/neutron_keystone_authtoken_spec.rb          | 4 ++--
 spec/classes/neutron_plugins_cisco_spec.rb               | 2 +-
 spec/classes/neutron_server_notifications_spec.rb        | 9 +++++----
 spec/classes/neutron_server_placement_spec.rb            | 8 ++++----
 10 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp
index e1cefd175..532214c55 100644
--- a/manifests/agents/ml2/networking_baremetal.pp
+++ b/manifests/agents/ml2/networking_baremetal.pp
@@ -54,7 +54,7 @@
 #   (optional) Authorization URL for connection to ironic in admin context.
 #   If version independent identity plugin is used available versions will be
 #   determined using auth_url
-#   Defaults to 'http://127.0.0.1:35357'
+#   Defaults to 'http://127.0.0.1:5000'
 #
 # [*username*]
 #   (optional) Username for connection to ironic in admin context
@@ -110,7 +110,7 @@ class neutron::agents::ml2::networking_baremetal (
   $keyfile             = $::os_service_default,
   $insecure            = $::os_service_default,
   $auth_type           = 'password',
-  $auth_url            = 'http://127.0.0.1:35357',
+  $auth_url            = 'http://127.0.0.1:5000',
   $username            = 'ironic',
   $project_domain_id   = 'default',
   $project_domain_name = 'Default',
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 4055ea926..c136b7949 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://localhost:35357'.
+#   Defaults to 'http://localhost:5000'.
 #
 # [*project_name*]
 #   (Optional) Service project name
@@ -187,7 +187,7 @@
 class neutron::keystone::authtoken(
   $username                       = 'neutron',
   $password                       = $::os_service_default,
-  $auth_url                       = 'http://localhost:35357',
+  $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
   $project_domain_name            = 'Default',
diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp
index 389ef4396..c404bcb00 100644
--- a/manifests/plugins/cisco.pp
+++ b/manifests/plugins/cisco.pp
@@ -30,7 +30,7 @@
 #
 # [*keystone_auth_url*]
 # The url against which to authenticate
-# Defaults to http://127.0.0.1:35357/v2.0/
+# Defaults to http://127.0.0.1:5000/v2.0/
 #
 # [*keystone_tenant*]
 # The tenant the supplied user has admin privs in
@@ -103,7 +103,7 @@ class neutron::plugins::cisco(
   # Keystone connection
   $keystone_username = 'neutron',
   $keystone_tenant   = 'services',
-  $keystone_auth_url = 'http://127.0.0.1:35357/v2.0/',
+  $keystone_auth_url = 'http://127.0.0.1:5000/v2.0/',
 
   $vswitch_plugin = 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
   $nexus_plugin   = $::os_service_default,
diff --git a/manifests/server/notifications.pp b/manifests/server/notifications.pp
index e50ff4deb..249662955 100644
--- a/manifests/server/notifications.pp
+++ b/manifests/server/notifications.pp
@@ -74,7 +74,7 @@
 #   (optional) Authorization URL for connection to nova in admin context.
 #   If version independent identity plugin is used available versions will be
 #   determined using auth_url
-#   Defaults to 'http://127.0.0.1:35357'
+#   Defaults to 'http://127.0.0.1:5000'
 #
 # [*region_name*]
 #   (optional) Name of nova region to use. Useful if keystone manages more than
@@ -108,7 +108,7 @@ class neutron::server::notifications (
   $project_name                       = 'services',
   $user_domain_id                     = 'default',
   $user_domain_name                   = 'Default',
-  $auth_url                           = 'http://127.0.0.1:35357',
+  $auth_url                           = 'http://127.0.0.1:5000',
   $region_name                        = $::os_service_default,
   $endpoint_type                      = $::os_service_default,
   # DEPRECATED PARAMETERS
diff --git a/manifests/server/placement.pp b/manifests/server/placement.pp
index b355e02ca..59109d42a 100644
--- a/manifests/server/placement.pp
+++ b/manifests/server/placement.pp
@@ -52,7 +52,7 @@
 #   (optional) Authorization URL for connection to nova in admin context.
 #   If version independent identity plugin is used available versions will be
 #   determined using auth_url
-#   Defaults to 'http://127.0.0.1:35357'
+#   Defaults to 'http://127.0.0.1:5000'
 #
 # [*region_name*]
 #   (optional) Name of nova region to use. Useful if keystone manages more than
@@ -74,7 +74,7 @@ class neutron::server::placement (
   $project_name        = 'services',
   $user_domain_id      = 'default',
   $user_domain_name    = 'Default',
-  $auth_url            = 'http://127.0.0.1:35357',
+  $auth_url            = 'http://127.0.0.1:5000',
   $region_name         = $::os_service_default,
   $endpoint_type       = $::os_service_default,
 ) {
diff --git a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
index 408b37d75..3ce1ae24e 100644
--- a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
+++ b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
@@ -7,7 +7,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do
       :manage_service      => true,
       :package_ensure      => 'present',
       :auth_type           => 'password',
-      :auth_url            => 'http://127.0.0.1:35357',
+      :auth_url            => 'http://127.0.0.1:5000',
       :username            => 'ironic',
       :project_domain_id   => 'default',
       :project_domain_name => 'Default',
diff --git a/spec/classes/neutron_keystone_authtoken_spec.rb b/spec/classes/neutron_keystone_authtoken_spec.rb
index bda5c7cbf..d3f837ad1 100644
--- a/spec/classes/neutron_keystone_authtoken_spec.rb
+++ b/spec/classes/neutron_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'neutron::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_neutron_config('keystone_authtoken/username').with_value('neutron')
         is_expected.to contain_neutron_config('keystone_authtoken/password').with_value('neutron_password')
-        is_expected.to contain_neutron_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
+        is_expected.to contain_neutron_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
         is_expected.to contain_neutron_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_neutron_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_neutron_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'neutron::keystone::authtoken' do
           :www_authenticate_uri                 => 'https://10.0.0.1:9999/',
           :username                             => 'myuser',
           :password                             => 'mypasswd',
-          :auth_url                             => 'https://127.0.0.1:35357',
+          :auth_url                             => 'https://127.0.0.1:5000',
           :project_name                         => 'service_project',
           :user_domain_name                     => 'domainX',
           :project_domain_name                  => 'domainX',
diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb
index e0d634b29..8a4525a20 100644
--- a/spec/classes/neutron_plugins_cisco_spec.rb
+++ b/spec/classes/neutron_plugins_cisco_spec.rb
@@ -13,7 +13,7 @@ describe 'neutron::plugins::cisco' do
   let :params do
     { :keystone_username => 'neutron',
       :keystone_password => 'neutron_pass',
-      :keystone_auth_url => 'http://127.0.0.1:35357/v2.0/',
+      :keystone_auth_url => 'http://127.0.0.1:5000/v2.0/',
       :keystone_tenant   => 'tenant',
 
       :database_name     => 'neutron',
diff --git a/spec/classes/neutron_server_notifications_spec.rb b/spec/classes/neutron_server_notifications_spec.rb
index 0742aaf0a..05363931c 100644
--- a/spec/classes/neutron_server_notifications_spec.rb
+++ b/spec/classes/neutron_server_notifications_spec.rb
@@ -30,7 +30,7 @@ describe 'neutron::server::notifications' do
             :project_name                       => 'services',
             :user_domain_id                     => 'default',
             :user_domain_name                   => 'Default',
-            :auth_url                           => 'http://127.0.0.1:35357',
+            :auth_url                           => 'http://127.0.0.1:5000',
         }
     end
 
@@ -47,7 +47,7 @@ describe 'neutron::server::notifications' do
             is_expected.to contain_neutron_config('DEFAULT/notify_nova_on_port_data_changes').with_value(true)
             is_expected.to contain_neutron_config('DEFAULT/send_events_interval').with_value('<SERVICE DEFAULT>')
             is_expected.to contain_neutron_config('nova/auth_type').with_value('password')
-            is_expected.to contain_neutron_config('nova/auth_url').with_value('http://127.0.0.1:35357')
+            is_expected.to contain_neutron_config('nova/auth_url').with_value('http://127.0.0.1:5000')
             is_expected.to contain_neutron_config('nova/username').with_value('nova')
             is_expected.to contain_neutron_config('nova/password').with_value('secrete')
             is_expected.to contain_neutron_config('nova/password').with_secret( true )
@@ -67,7 +67,8 @@ describe 'neutron::server::notifications' do
                     :notify_nova_on_port_status_changes => false,
                     :notify_nova_on_port_data_changes   => false,
                     :send_events_interval               => '10',
-                    :auth_url                           => 'http://keystone:35357/v2.0',
+                    :auth_url                           =>
+'http://keystone:5000/v2.0',
                     :auth_type                          => 'v2password',
                     :username                           => 'joe',
                     :region_name                        => 'MyRegion',
@@ -83,7 +84,7 @@ describe 'neutron::server::notifications' do
                 is_expected.to contain_neutron_config('DEFAULT/notify_nova_on_port_status_changes').with_value(false)
                 is_expected.to contain_neutron_config('DEFAULT/notify_nova_on_port_data_changes').with_value(false)
                 is_expected.to contain_neutron_config('DEFAULT/send_events_interval').with_value('10')
-                is_expected.to contain_neutron_config('nova/auth_url').with_value('http://keystone:35357/v2.0')
+                is_expected.to contain_neutron_config('nova/auth_url').with_value('http://keystone:5000/v2.0')
                 is_expected.to contain_neutron_config('nova/auth_type').with_value('v2password')
                 is_expected.to contain_neutron_config('nova/username').with_value('joe')
                 is_expected.to contain_neutron_config('nova/password').with_value('secrete')
diff --git a/spec/classes/neutron_server_placement_spec.rb b/spec/classes/neutron_server_placement_spec.rb
index 96c7f9e70..b18087735 100644
--- a/spec/classes/neutron_server_placement_spec.rb
+++ b/spec/classes/neutron_server_placement_spec.rb
@@ -27,7 +27,7 @@ describe 'neutron::server::placement' do
             :project_name        => 'services',
             :user_domain_id      => 'default',
             :user_domain_name    => 'Default',
-            :auth_url            => 'http://127.0.0.1:35357',
+            :auth_url            => 'http://127.0.0.1:5000',
         }
     end
 
@@ -41,7 +41,7 @@ describe 'neutron::server::placement' do
 
         it 'configure neutron.conf' do
             is_expected.to contain_neutron_config('placement/auth_type').with_value('password')
-            is_expected.to contain_neutron_config('placement/auth_url').with_value('http://127.0.0.1:35357')
+            is_expected.to contain_neutron_config('placement/auth_url').with_value('http://127.0.0.1:5000')
             is_expected.to contain_neutron_config('placement/username').with_value('nova')
             is_expected.to contain_neutron_config('placement/password').with_value('secrete')
             is_expected.to contain_neutron_config('placement/password').with_secret( true )
@@ -56,7 +56,7 @@ describe 'neutron::server::placement' do
         context 'when overriding parameters' do
             before :each do
                 params.merge!(
-                    :auth_url            => 'http://keystone:35357/v2.0',
+                    :auth_url            => 'http://keystone:5000/v2.0',
                     :auth_type           => 'v2password',
                     :username            => 'joe',
                     :region_name         => 'MyRegion',
@@ -68,7 +68,7 @@ describe 'neutron::server::placement' do
                 )
             end
             it 'should configure neutron server with overrided parameters' do
-                is_expected.to contain_neutron_config('placement/auth_url').with_value('http://keystone:35357/v2.0')
+                is_expected.to contain_neutron_config('placement/auth_url').with_value('http://keystone:5000/v2.0')
                 is_expected.to contain_neutron_config('placement/auth_type').with_value('v2password')
                 is_expected.to contain_neutron_config('placement/username').with_value('joe')
                 is_expected.to contain_neutron_config('placement/password').with_value('secrete')