Merge "Fix gnocchi auth issue"

ansible/roles/gnocchi/handlers/main.yml

@@ -20,7 +20,6 @@
     - config_json.changed | bool
       or gnocchi_conf.changed | bool
       or policy_json.changed | bool
-      or gnocchi_api_paste_ini.changed | bool
       or gnocchi_wsgi_conf.changed | bool
       or gnocchi_api_container.changed | bool
 

ansible/roles/gnocchi/tasks/config.yml

@@ -21,22 +21,6 @@
     - Restart gnocchi-metricd container
     - Restart gnocchi-statsd container
 
-- name: Copying over api-paste.ini
-  vars:
-    service: "{{ gnocchi_services['gnocchi-api'] }}"
-  merge_configs:
-    sources:
-      - "{{ 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"
-  register: gnocchi_api_paste_ini
-  when:
-    - inventory_hostname in groups['gnocchi-api']
-    - service.enabled | bool
-  notify:
-    - Restart gnocchi-api container
-
 - name: Copying over gnocchi.conf
   merge_configs:
     vars:

ansible/roles/gnocchi/templates/api-paste.ini.j2

@@ -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

ansible/roles/gnocchi/templates/gnocchi-api.json.j2

@@ -9,12 +9,6 @@
             "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",

ansible/roles/gnocchi/templates/gnocchi.conf.j2

@@ -8,6 +8,7 @@ log_dir = /var/log/kolla/gnocchi
 port = {{ gnocchi_api_port }}
 host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 middlewares = keystonemiddleware.auth_token.AuthProtocol
+auth_mode = keystone
 
 
 [database]