Add Barometer service as a Compute role.

Change-Id: I397d2557639c87ab8afacd076a5b9fd7c056dce7
Signed-off-by: jhinman1 <john.hinman@intel.com>

diff --git a/environments/enable_barometer.yaml b/environments/enable_barometer.yaml
new file mode 100644 (file)
index 0000000..0cdc880
--- /dev/null
+++ b/environments/enable_barometer.yaml
@@ -0,0 +1,16 @@
+# Copyright 2015-2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+resource_registry:
+  OS::TripleO::Services::Barometer: ../puppet/services/barometer.yaml

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 9388f04..bd92d2b 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -115,6 +115,7 @@ resource_registry:
   OS::TripleO::Services: puppet/services/services.yaml
   OS::TripleO::Services::Apache: puppet/services/apache.yaml
   OS::TripleO::Services::ApacheTLS: OS::Heat::None
+  OS::TripleO::Services::Barometer: OS::Heat::None
   OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
   OS::TripleO::Services::CephMds: OS::Heat::None
   OS::TripleO::Services::CephMon: OS::Heat::None

diff --git a/puppet/services/barometer.yaml b/puppet/services/barometer.yaml
new file mode 100644 (file)
index 0000000..64abe63
--- /dev/null
+++ b/puppet/services/barometer.yaml
@@ -0,0 +1,57 @@
+# Copyright 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+heat_template_version: 2014-10-16
+ 
+description: >
+  Install Barometer (Fastpath Quality Metrics = collectd with RDT) on compute nodes
+ 
+# Note extra parameters can be defined, then passed data via the
+# environment parameter_defaults, without modifying the parent template
+parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  CeilometerPassword:
+    default: {}
+    description: the password for the ceilometer service account
+    type: string
+  GnocchiPassword:
+    default: {}
+    description: the password for the gnocchi service account
+    type: string
+
+outputs:
+  role_data:
+    description: Role data for Barometer role.
+    value:
+      service_name: barometer
+      config_settings:
+        barometer::collectd::collectd_password: {get_param: GnocchiPassword}
+        barometer::collectd::collectd_username: 'gnocchi'
+        barometer::collectd::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+      step_config: |
+        include ::tripleo::profile::base::barometer
+

diff --git a/roles_data.yaml b/roles_data.yaml
index a265b46..d69239c 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -140,6 +140,7 @@
   HostnameFormatDefault: '%stackname%-novacompute-%index%'
   disable_upgrade_deployment: True
   ServicesDefault:
+    - OS::TripleO::Services::Barometer
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal