From d881dd52289d453b9f9d94c7c32c0672a70a8064 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 16 Oct 2017 11:31:51 +0200
Subject: Remove Ceilometer API

This removes the deprecated Ceilometer API.

Change-Id: I752b36b3dfe8f935b68c4d3d59ccb5b8b60c582f
---
 etc/apache2/ceilometer                          | 39 -------------------------
 etc/ceilometer/api_paste.ini                    | 27 -----------------
 etc/ceilometer/ceilometer-config-generator.conf |  3 --
 etc/ceilometer/policy.json                      | 15 ----------
 4 files changed, 84 deletions(-)
 delete mode 100644 etc/apache2/ceilometer
 delete mode 100644 etc/ceilometer/api_paste.ini
 delete mode 100644 etc/ceilometer/policy.json

(limited to 'etc')

diff --git a/etc/apache2/ceilometer b/etc/apache2/ceilometer
deleted file mode 100644
index 261acc3e..00000000
--- a/etc/apache2/ceilometer
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2013 New Dream Network, LLC (DreamHost)
-#
-# 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.
-
-# This is an example Apache2 configuration file for using the
-# ceilometer API through mod_wsgi.
-
-# Note: If you are using a Debian-based system then the paths
-# "/var/log/httpd" and "/var/run/httpd" will use "apache2" instead
-# of "httpd".
-#
-# The number of processes and threads is an example only and should
-# be adjusted according to local requirements.
-
-Listen 8777
-
-<VirtualHost *:8777>
-    WSGIDaemonProcess ceilometer-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP}
-    WSGIProcessGroup ceilometer-api
-    WSGIScriptAlias / /var/www/ceilometer/app
-    WSGIApplicationGroup %{GLOBAL}
-    <IfVersion >= 2.4>
-        ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/httpd/ceilometer_error.log
-    CustomLog /var/log/httpd/ceilometer_access.log combined
-</VirtualHost>
-
-WSGISocketPrefix /var/run/httpd
diff --git a/etc/ceilometer/api_paste.ini b/etc/ceilometer/api_paste.ini
deleted file mode 100644
index 4247f1bb..00000000
--- a/etc/ceilometer/api_paste.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# Ceilometer API WSGI Pipeline
-# Define the filters that make up the pipeline for processing WSGI requests
-# Note: This pipeline is PasteDeploy's term rather than Ceilometer's pipeline
-# used for processing samples
-
-# Remove authtoken from the pipeline if you don't want to use keystone authentication
-[pipeline:main]
-pipeline = cors http_proxy_to_wsgi request_id authtoken api-server
-
-[app:api-server]
-paste.app_factory = ceilometer.api.app:app_factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-oslo_config_project = ceilometer
-
-[filter:request_id]
-paste.filter_factory = oslo_middleware:RequestId.factory
-oslo_config_project = ceilometer
-
-[filter:cors]
-paste.filter_factory = oslo_middleware.cors:filter_factory
-oslo_config_project = ceilometer
-
-[filter:http_proxy_to_wsgi]
-paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
-oslo_config_project = ceilometer
diff --git a/etc/ceilometer/ceilometer-config-generator.conf b/etc/ceilometer/ceilometer-config-generator.conf
index 976385b7..205c093d 100644
--- a/etc/ceilometer/ceilometer-config-generator.conf
+++ b/etc/ceilometer/ceilometer-config-generator.conf
@@ -7,8 +7,5 @@ namespace = oslo.concurrency
 namespace = oslo.db
 namespace = oslo.log
 namespace = oslo.messaging
-namespace = oslo.middleware.cors
-namespace = oslo.middleware.http_proxy_to_wsgi
-namespace = oslo.policy
 namespace = oslo.service.service
 namespace = keystonemiddleware.auth_token
diff --git a/etc/ceilometer/policy.json b/etc/ceilometer/policy.json
deleted file mode 100644
index 0aa0a3d1..00000000
--- a/etc/ceilometer/policy.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "context_is_admin": "role:admin",
-    "segregation": "rule:context_is_admin",
-
-    "telemetry:get_samples": "",
-    "telemetry:get_sample": "",
-    "telemetry:query_sample": "",
-    "telemetry:create_samples": "",
-
-    "telemetry:compute_statistics": "",
-    "telemetry:get_meters": "",
-
-    "telemetry:get_resource": "",
-    "telemetry:get_resources": "",
-}
-- 
cgit v1.2.1