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 25272f95868a2705ff82fbe1e039e2c3d2053eae..ddc0698d2c96901f09f3dcf76682ec9b5a87ea2b 100644 (file)
--- 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 1e86b7749844c1bd4cddf814b7a853e52768347e..df5a3220b6a75cda2e4e2e6b85148d7f01c8faf2 100644 (file)
--- 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 8aefccfbdbdec87c391e408352acb4a9aff554da..ce492b2f53e1100848729d4d1f4f329796c9a4ce 100644 (file)
--- 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 5b4a6f6c5ce1fba9dbef2d438451d679475c8d5d..96ff88140422ec998a289c7a57b79af514eb11bd 100644 (file)
--- 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',