Add authentication config opts

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index 510f09de81b90b03b243a3374d0ae54031b4ac94..d1042ebe8df16f23b2730fa49e18f7342c6187b6 100644 (file)
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
@@ -2,7 +2,13 @@
 #
 #
 class ceilometer::agent::central(
-  $enabled = true,
+  $auth_url         = 'http://localhost:5000/v2.0',
+  $auth_region      = 'RegionOne',
+  $auth_user        = 'ceilometer',
+  $auth_password    = 'password',
+  $auth_tenant_name = 'service',
+  $auth_tenant_id   = null,
+  $enabled          = true,
 ) {
 
   package { 'ceilometer-agent-central':
@@ -23,4 +29,16 @@ class ceilometer::agent::central(
     require    => Package['ceilometer-agent-central']
   }
 
+  ceilometer_config {
+    'DEFAULT/os_auth_url'         : value => $auth_url;
+    'DEFAULT/os_auth_region'      : value => $auth_region;
+    'DEFAULT/os_username'         : value => $auth_username;
+    'DEFAULT/os_tenant_name'      : value => $auth_tenant_name;
+  }
+
+  if ($auth_tenant_id) {
+    ceilometer_config {
+      'DEFAULT/os_tenant_id'        : value => $auth_tenant_id;
+    }
+  }
 }

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index dff5d986ee10a5c25d65d75358fc816b49bb3cab..e276172a5baddde0a49649a0ef457ce3e995626e 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -2,7 +2,13 @@
 #
 #
 class ceilometer::agent::compute(
-  $enabled = true,
+  $auth_url         = 'http://localhost:5000/v2.0',
+  $auth_region      = 'RegionOne',
+  $auth_user        = 'ceilometer',
+  $auth_password    = 'password',
+  $auth_tenant_name = 'service',
+  $auth_tenant_id   = null,
+  $enabled          = true,
 ) {
 
   package { 'ceilometer-agent-compute':
@@ -23,4 +29,17 @@ class ceilometer::agent::compute(
     require    => Package['ceilometer-agent-compute']
   }
 
+  ceilometer_config {
+    'DEFAULT/os_auth_url'         : value => $auth_url;
+    'DEFAULT/os_auth_region'      : value => $auth_region;
+    'DEFAULT/os_username'         : value => $auth_username;
+    'DEFAULT/os_tenant_name'      : value => $auth_tenant_name;
+    'DEFAULT/os_tenant_id'        : value => $auth_tenant_id;
+  }
+
+  if ($auth_tenant_id) {
+    ceilometer_config {
+      'DEFAULT/os_tenant_id'        : value => $auth_tenant_id;
+    }
+  }
 }