Merge "Remove ceilometer apache files on upgrade"

1 files changed, 41 insertions, 0 deletions

diff --git a/puppet/services/disabled/ceilometer-api-disabled.yaml b/puppet/services/disabled/ceilometer-api-disabled.yaml
new file mode 100644
index 00000000..6dce61e3
--- /dev/null
+++ b/puppet/services/disabled/ceilometer-api-disabled.yaml
@@ -0,0 +1,41 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Ceilometer API service, disabled since pike
+
+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
+  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
+
+outputs:
+  role_data:
+    description: Role data for the disabled Ceilometer API role.
+    value:
+      service_name: ceilometer_api_disabled
+      upgrade_tasks:
+        - name: Purge Ceilometer apache config files
+          tags: step1
+          file: path=/etc/httpd/conf.d/10-ceilometer_wsgi.conf state=absent
+        - name: Clean up ceilometer port from ports.conf
+          tags: step1
+          lineinfile: dest=/etc/httpd/conf/ports.conf state=absent regexp="8777$"