Update SHAs and config templates

The role has not been updated to the current pattern for independent
roles, to track master of the OpenStack role in test. This steps up
through about 3 months of development in Gnocchi, and includes the
necessary changes to paste and policy files to make Gnocci run as
expected while still including the healthcheck middleware which is
not included upstream.

During bootstrap/migration of the DB we now need to ensure that the
create-legacy-resource-types switch is given to ensure that these
are available to Ceilometer. The behavior has changed in Gnocchi to
require this for storage of standard metrics from Ceilometer.

Change-Id: I7f3cdd58bbee5bbb1704bf710397ca2ee390f03f

defaults/main.yml

@@ -23,9 +23,9 @@ debug: false
 # to build an environment directly from a git source without the presence
 # of an OpenStack-Ansible repo_server.
 gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
-gnocchi_git_install_branch: 2e6a1b18df876c95482c266b4725b65941491f8a
+gnocchi_git_install_branch: master
 gnocchi_requirements_git_repo: https://git.openstack.org/openstack/requirements
-gnocchi_requirements_git_install_branch: 6d42646b62e188c26eb031cbb5987db2cc0ccb10
+gnocchi_requirements_git_install_branch: master
 gnocchi_developer_mode: false
 gnocchi_developer_constraints:
   - "git+{{ gnocchi_git_repo }}@{{ gnocchi_git_install_branch }}#egg=gnocchi"
@@ -68,7 +68,7 @@ gnocchi_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/gnocchi.tgz
 gnocchi_galera_database: gnocchi
 gnocchi_galera_user: gnocchi
 gnocchi_galera_address: "{{ galera_address }}"
-gnocchi_db_sync_options: "" 
+gnocchi_db_sync_options: "--create-legacy-resource-types"
 
 #: Storage info
 gnocchi_storage_driver: file

ext/repo_packages/openstack_gnocchi.yml

@@ -15,6 +15,6 @@
 
 #: Gnocchi program source location
 gnocchi_git_repo: "https://git.openstack.org/openstack/gnocchi"
-gnocchi_git_install_branch: 2e6a1b18df876c95482c266b4725b65941491f8a # head of "master" as of 27.01.2016
+gnocchi_git_install_branch: 45150036bb143fd639082e817581502636504806 # head of "master" as of 29.04.2016
 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
 

templates/gnocchi-api-paste.ini.j2

@@ -1,15 +1,29 @@
 # {{ ansible_managed }}
 
-# Remove keystone_authtoken from the pipeline if you don't want to use keystone authentication
+# Use gnocchi+noauth in the pipeline if you don't want keystone authentication
 [pipeline:main]
-pipeline = healthcheck keystone_authtoken gnocchi
+pipeline = gnocchi+auth
 
-[app:gnocchi]
+[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
 
-[filter:keystone_authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-oslo_config_project = gnocchi
+[app:gnocchiv1]
+paste.app_factory = gnocchi.rest.app:app_factory
+root = gnocchi.rest.V1Controller
 
 [filter:healthcheck]
 paste.filter_factory = oslo_middleware:Healthcheck.factory
@@ -17,6 +31,10 @@ path = /status
 backends = disable_by_file
 disable_by_file_path = {{ gnocchi_healthcheck_disable_path }}
 
+[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

templates/policy.json.j2

@@ -9,10 +9,13 @@
     "get resource": "rule:admin_or_creator or rule:resource_owner",
     "update resource": "rule:admin_or_creator",
     "delete resource": "rule:admin_or_creator",
-    "list resource": "",
-    "list all resource": "role:admin",
-    "search resource": "",
-    "search all resource": "role:admin",
+    "list resource": "rule:admin_or_creator or rule:resource_owner",
+    "search resource": "rule:admin_or_creator or rule:resource_owner",
+
+    "create resource type": "role:admin",
+    "delete resource type": "role:admin",
+    "list resource type": "",
+    "get resource type": "",
 
     "get archive policy": "",
     "list archive policy": "",
@@ -33,4 +36,4 @@
 
     "get measures":  "rule:admin_or_creator or rule:metric_owner",
     "post measures":  "rule:admin_or_creator"
-}
+}