From 46fb00d8c794d95cf4b7d40094192cd433087853 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 23 Mar 2016 23:11:48 +0000 Subject: [PATCH] Update role for stable/mitaka testing This updates the repository SHA's to use stable/mitaka where available and updated SHA's where not. It also updates all paste, policy and rootwrap configurations to match the current contents found in stable/mitaka. Change-Id: Ie42efbce98d7ecc6234fca26488a95b54901db55 --- templates/api-paste.ini.j2 | 7 +++++-- templates/policy.json.j2 | 9 +++++---- tests/test-vars.yml | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/templates/api-paste.ini.j2 b/templates/api-paste.ini.j2 index 89d1ed4..b899d46 100644 --- a/templates/api-paste.ini.j2 +++ b/templates/api-paste.ini.j2 @@ -15,8 +15,8 @@ paste.app_factory = designate.api.versions:factory [composite:osapi_dns_v1] use = call:designate.api.middleware:auth_pipeline_factory -noauth = http_proxy_to_wsgi cors request_id noauthcontext maintenance validation_API_v1 faultwrapper normalizeuri osapi_dns_app_v1 -keystone = http_proxy_to_wsgi cors request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper normalizeuri osapi_dns_app_v1 +noauth = http_proxy_to_wsgi cors request_id noauthcontext maintenance validation_API_v1 faultwrapper_v1 normalizeuri osapi_dns_app_v1 +keystone = http_proxy_to_wsgi cors request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper_v1 normalizeuri osapi_dns_app_v1 [app:osapi_dns_app_v1] @@ -66,6 +66,9 @@ paste.filter_factory = designate.api.middleware:NormalizeURIMiddleware.factory [filter:faultwrapper] paste.filter_factory = designate.api.middleware:FaultWrapperMiddleware.factory +[filter:faultwrapper_v1] +paste.filter_factory = designate.api.middleware:FaultWrapperMiddlewareV1.factory + [filter:validation_API_v1] paste.filter_factory = designate.api.middleware:APIv1ValidationErrorMiddleware.factory diff --git a/templates/policy.json.j2 b/templates/policy.json.j2 index a31425a..5b9b842 100644 --- a/templates/policy.json.j2 +++ b/templates/policy.json.j2 @@ -51,6 +51,7 @@ "xfr_zone": "rule:admin_or_owner", "abandon_zone": "rule:admin", "count_zones": "rule:admin_or_owner", + "count_zones_pending_notify": "rule:admin_or_owner", "purge_zones": "rule:admin", "touch_zone": "rule:admin_or_owner", @@ -80,7 +81,7 @@ "get_blacklist": "rule:admin", "update_blacklist": "rule:admin", "delete_blacklist": "rule:admin", - "use_blacklisted_domain": "rule:admin", + "use_blacklisted_zone": "rule:admin", "create_pool": "rule:admin", "find_pools": "rule:admin", @@ -88,10 +89,11 @@ "get_pool": "rule:admin", "update_pool": "rule:admin", "delete_pool": "rule:admin", + "zone_create_forced_pool": "rule:admin", "diagnostics_ping": "rule:admin", - "diagnostics_sync_domains": "rule:admin", - "diagnostics_sync_domain": "rule:admin", + "diagnostics_sync_zones": "rule:admin", + "diagnostics_sync_zone": "rule:admin", "diagnostics_sync_record": "rule:admin", "create_zone_transfer_request": "rule:admin_or_owner", @@ -122,4 +124,3 @@ "update_zone_export": "rule:admin_or_owner", "delete_zone_export": "rule:admin_or_owner" } - diff --git a/tests/test-vars.yml b/tests/test-vars.yml index e33e55b..91911c3 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -25,8 +25,8 @@ memcached_servers: 127.0.0.1 memcached_encryption_key: "secrete" keystone_venv_tag: "testing" keystone_developer_mode: true -keystone_git_install_branch: a55128044f763f5cfe2fdc57c738eaca97636448 # HEAD of "master" as of 17.01.2016 -keystone_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0 # HEAD of "master" as of 17.01.2016 +keystone_git_install_branch: stable/mitaka +keystone_requirements_git_install_branch: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 keystone_service_password: "secrete" keystone_galera_address: 10.100.100.101 keystone_galera_database: keystone @@ -52,8 +52,8 @@ openrc_os_password: "{{ keystone_auth_admin_password }}" openrc_os_domain_name: "Default" designate_venv_tag: "testing" designate_developer_mode: true -designate_git_install_branch: 4df88d7b28a05cb3556573ce4f1c7c66abf944bb # HEAD of "master" as of 17.01.2016 -designate_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0 # HEAD of "master" as of 17.01.2016 +designate_git_install_branch: stable/mitaka +designate_requirements_git_install_branch: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 designate_service_password: "secrete" designate_galera_address: 10.100.100.101 designate_container_mysql_password: "SuperSecrete"