From: qiaomin <chen.qiaomin@99cloud.net>
Date: Sat, 12 May 2018 16:30:13 +0000 (+0800)
Subject: Replace port 35357 with 5000
X-Git-Tag: 13.1.0~1^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5650855f4db7e8000bfc3b583f1beeab40b98dcf;p=puppet-modules%2Fpuppet-ceilometer.git

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: Iec71def4bcff2dc5ff5227d0cbcc9f5da2352272
---

diff --git a/README.md b/README.md
index 25272f9..ddc0698 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ class { '::ceilometer::agent::notification': }
 class { '::ceilometer::db': }
 class { '::ceilometer::keystone::authtoken':
   password => 'a_big_secret',
-  auth_url => 'http://127.0.0.1:35357/',
+  auth_url => 'http://127.0.0.1:5000/',
 }
 ```
 
diff --git a/examples/site.pp b/examples/site.pp
index 1e86b77..df5a322 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -36,7 +36,7 @@ node default {
 
   # Set common auth parameters used by all agents (compute/central)
   class { '::ceilometer::agent::auth':
-    auth_url      => 'http://localhost:35357/v2.0',
+    auth_url      => 'http://localhost:5000/v2.0',
     auth_password => 'tralalerotralala'
   }
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 8aefccf..ce492b2 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 ceilometer::keystone::authtoken(
   $username                       = 'ceilometer',
   $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/spec/classes/ceilometer_keystone_authtoken_spec.rb b/spec/classes/ceilometer_keystone_authtoken_spec.rb
index 5b4a6f6..96ff881 100644
--- a/spec/classes/ceilometer_keystone_authtoken_spec.rb
+++ b/spec/classes/ceilometer_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'ceilometer::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_ceilometer_config('keystone_authtoken/username').with_value('ceilometer')
         is_expected.to contain_ceilometer_config('keystone_authtoken/password').with_value('ceilometer_password')
-        is_expected.to contain_ceilometer_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
+        is_expected.to contain_ceilometer_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000/')
         is_expected.to contain_ceilometer_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_ceilometer_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_ceilometer_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'ceilometer::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',