Ceilometer Compute Agent composable service

Implement the service for ceilometer agent compute.

Change-Id: I5ab3887832588ce26e2d258d05f725d87d2c103d

3 files changed, 26 insertions, 7 deletions

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index d7cf7787..8de9a19c 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -434,7 +434,6 @@ resources:
                 ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
                 ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                 ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url}
-                ceilometer_compute_agent: {get_input: ceilometer_compute_agent}
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 neutron::debug: {get_input: debug}
                 neutron::rabbit_password: {get_input: rabbit_password}
@@ -486,7 +485,6 @@ resources:
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
         ceilometer_password: {get_param: CeilometerPassword}
-        ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
         ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
         glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
         neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 6e446fd8..7255db83 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -23,11 +23,6 @@ if hiera('step') >= 4 {
     'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
   }
 
-  include ::ceilometer
-  include ::ceilometer::config
-  include ::ceilometer::agent::compute
-  include ::ceilometer::agent::auth
-
   hiera_include('compute_classes')
 }
 
diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
new file mode 100644
index 00000000..737836af
--- /dev/null
+++ b/puppet/services/ceilometer-agent-compute.yaml
@@ -0,0 +1,26 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Ceilometer Compute Agent service configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  CeilometerServiceBase:
+    type: ./ceilometer-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Ceilometer Compute Agent role.
+    value:
+      config_settings:
+        get_attr: [CeilometerServiceBase, role_data, config_settings]
+      step_config: |
+        include ::tripleo::profile::base::ceilometer::agent::compute