aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2018-01-26 15:29:53 +0000
committerTim Rozet <trozet@redhat.com>2018-02-13 10:30:06 -0500
commitc35d685b8422b455c87162cbc0c1ea3fbc6c9a9a (patch)
tree380729da9accccd483212e0ede09580e9e047ea8
parentf7dcfb29e0acacbf2e463c89e1a4ac0f8888940c (diff)
Add Barometer service as a Compute role.
Change-Id: I3250b57316b4ec85e0558f1b512f6f3ed7c349fb Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com> Signed-off-by: jhinman1 <john.hinman@intel.com>
-rw-r--r--environments/enable_barometer.yaml16
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
-rw-r--r--puppet/services/barometer.yaml65
3 files changed, 82 insertions, 0 deletions
diff --git a/environments/enable_barometer.yaml b/environments/enable_barometer.yaml
new file mode 100644
index 00000000..ea10c166
--- /dev/null
+++ b/environments/enable_barometer.yaml
@@ -0,0 +1,16 @@
+# Copyright 2015-2018 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 3ee77218..f03c975e 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -114,6 +114,7 @@ resource_registry:
# services
OS::TripleO::Services: common/services.yaml
OS::TripleO::Services::Apache: puppet/services/apache.yaml
+ 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
index 00000000..fbd6d5da
--- /dev/null
+++ b/puppet/services/barometer.yaml
@@ -0,0 +1,65 @@
+# Copyright 2017-2018 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:
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
+ 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
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
+ EndpointMap:
+ default: {}
+ description: Mapping of service endpoint -> protocol. Typically set
+ via parameter_defaults in the resource registry.
+ type: json
+ GnocchiPassword:
+ description: The password for the gnocchi service and db account.
+ type: string
+ hidden: true
+
+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
+