From 87f019481ebd54adf65e3d7e97330ee67ab28af9 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 26 Sep 2016 10:46:16 +0800
Subject: Rename the gnocchi api-paste filename

* Rename gnocchi-api-paste.ini to api-paste which is used in gnocchi
* Copy api-paste.ini to /etc/gnocchi in container

TrivialFix

Change-Id: I0ea5d947f3a4323e641a041fb190cae3031d36b2
---
 ansible/roles/gnocchi/tasks/config.yml             | 10 +++---
 ansible/roles/gnocchi/templates/api-paste.ini.j2   | 38 ++++++++++++++++++++++
 .../gnocchi/templates/gnocchi-api-paste.ini.j2     | 38 ----------------------
 .../roles/gnocchi/templates/gnocchi-api.json.j2    |  6 ++++
 4 files changed, 49 insertions(+), 43 deletions(-)
 create mode 100644 ansible/roles/gnocchi/templates/api-paste.ini.j2
 delete mode 100644 ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2

diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml
index 7baa626d3..2e7a75a8a 100644
--- a/ansible/roles/gnocchi/tasks/config.yml
+++ b/ansible/roles/gnocchi/tasks/config.yml
@@ -18,13 +18,13 @@
     - "gnocchi-metricd"
     - "gnocchi-statsd"
 
-- name: Copying over gnocchi-api-paste.ini
+- name: Copying over api-paste.ini
   merge_configs:
     sources:
-      - "{{ role_path }}/templates/gnocchi-api-paste.ini.j2"
-      - "{{ node_custom_config }}/gnocchi/gnocchi-api-paste.ini"
-      - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/gnocchi-api-paste.ini"
-    dest: "{{ node_config_directory }}/gnocchi-api/gnocchi-api-paste.ini"
+      - "{{ role_path }}/templates/api-paste.ini.j2"
+      - "{{ node_custom_config }}/gnocchi/api-paste.ini"
+      - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/api-paste.ini"
+    dest: "{{ node_config_directory }}/gnocchi-api/api-paste.ini"
 
 - name: Copying over gnocchi.conf
   merge_configs:
diff --git a/ansible/roles/gnocchi/templates/api-paste.ini.j2 b/ansible/roles/gnocchi/templates/api-paste.ini.j2
new file mode 100644
index 000000000..22b8c44b0
--- /dev/null
+++ b/ansible/roles/gnocchi/templates/api-paste.ini.j2
@@ -0,0 +1,38 @@
+# Use gnocchi+noauth in the pipeline if you don't want keystone authentication
+[pipeline:main]
+pipeline = gnocchi+auth
+
+[composite:gnocchi+noauth]
+use = egg:Paste#urlmap
+/ = gnocchiversions
+/v1 = gnocchiv1
+
+[composite:gnocchi+auth]
+use = egg:Paste#urlmap
+/ = gnocchiversions
+/v1 = gnocchiv1+auth
+
+[pipeline:gnocchiv1+auth]
+pipeline = healthcheck keystone_authtoken gnocchiv1
+
+[app:gnocchiversions]
+paste.app_factory = gnocchi.rest.app:app_factory
+root = gnocchi.rest.VersionsController
+
+[app:gnocchiv1]
+paste.app_factory = gnocchi.rest.app:app_factory
+root = gnocchi.rest.V1Controller
+
+[filter:healthcheck]
+paste.filter_factory = oslo_middleware:Healthcheck.factory
+path = /status
+backends = disable_by_file
+
+
+[filter:keystone_authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+oslo_config_project = gnocchi
+
+[filter:cors]
+paste.filter_factory = oslo_middleware.cors:filter_factory
+oslo_config_project = gnocchi
diff --git a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 b/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2
deleted file mode 100644
index 22b8c44b0..000000000
--- a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-# Use gnocchi+noauth in the pipeline if you don't want keystone authentication
-[pipeline:main]
-pipeline = gnocchi+auth
-
-[composite:gnocchi+noauth]
-use = egg:Paste#urlmap
-/ = gnocchiversions
-/v1 = gnocchiv1
-
-[composite:gnocchi+auth]
-use = egg:Paste#urlmap
-/ = gnocchiversions
-/v1 = gnocchiv1+auth
-
-[pipeline:gnocchiv1+auth]
-pipeline = healthcheck keystone_authtoken gnocchiv1
-
-[app:gnocchiversions]
-paste.app_factory = gnocchi.rest.app:app_factory
-root = gnocchi.rest.VersionsController
-
-[app:gnocchiv1]
-paste.app_factory = gnocchi.rest.app:app_factory
-root = gnocchi.rest.V1Controller
-
-[filter:healthcheck]
-paste.filter_factory = oslo_middleware:Healthcheck.factory
-path = /status
-backends = disable_by_file
-
-
-[filter:keystone_authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-oslo_config_project = gnocchi
-
-[filter:cors]
-paste.filter_factory = oslo_middleware.cors:filter_factory
-oslo_config_project = gnocchi
diff --git a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
index 318807a9f..2e5749f51 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
@@ -9,6 +9,12 @@
             "owner": "gnocchi",
             "perm": "0600"
         },
+        {
+            "source": "{{ container_config_directory }}/api-paste.ini",
+            "dest": "/etc/gnocchi/api-paste.ini",
+            "owner": "gnocchi",
+            "perm": "0600"
+        },
         {
             "source": "{{ container_config_directory }}/wsgi-gnocchi.conf",
             "dest": "/etc/{{ gnocchi_dir }}/wsgi-gnocchi.conf",
-- 
cgit v1.2.3