From 9ea065ebea02b117afe60b2febb6678e651342ea Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Tue, 7 Feb 2017 17:08:10 +0200 Subject: [PATCH] Enable share groups back This feature was disabled by default in Ocata. Now, enable it back to ease further work and updates of this feaure. Change-Id: Ib57b55ce77df1b8e6481057014f2e9f6d743e34d --- contrib/ci/post_test_hook.sh | 9 ++---- devstack/plugin.sh | 8 ++---- etc/manila/policy.json | 54 ++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 11ef69aebc..d20a6bdef8 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -70,10 +70,7 @@ RUN_MANILA_QUOTA_TESTS=${RUN_MANILA_QUOTA_TESTS:-True} RUN_MANILA_SHRINK_TESTS=${RUN_MANILA_SHRINK_TESTS:-True} RUN_MANILA_SNAPSHOT_TESTS=${RUN_MANILA_SNAPSHOT_TESTS:-True} RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=${RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS:-False} - -# TODO(vponomaryov): turn 'RUN_MANILA_SG_TESTS' on back in Pike -# RUN_MANILA_SG_TESTS=${RUN_MANILA_SG_TESTS:-${RUN_MANILA_CG_TESTS:-True}} -RUN_MANILA_SG_TESTS=False +RUN_MANILA_SG_TESTS=${RUN_MANILA_SG_TESTS:-${RUN_MANILA_CG_TESTS:-True}} RUN_MANILA_MANAGE_TESTS=${RUN_MANILA_MANAGE_TESTS:-True} RUN_MANILA_MANAGE_SNAPSHOT_TESTS=${RUN_MANILA_MANAGE_SNAPSHOT_TESTS:-False} RUN_MANILA_REPLICATION_TESTS=${RUN_MANILA_REPLICATION_TESTS:-False} @@ -215,9 +212,7 @@ elif [[ "$DRIVER" == "zfsonlinux" ]]; then iniset $TEMPEST_CONFIG share capability_snapshot_support True elif [[ "$DRIVER" == "dummy" ]]; then MANILA_TEMPEST_CONCURRENCY=24 - - # TODO(vponomaryov): turn 'RUN_MANILA_SG_TESTS' on back in Pike - RUN_MANILA_SG_TESTS=False + RUN_MANILA_SG_TESTS=True RUN_MANILA_MANAGE_TESTS=False RUN_MANILA_DRIVER_ASSISTED_MIGRATION_TESTS=True RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 4c990c0f7a..6f6e1f1c9c 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -181,8 +181,7 @@ function configure_manila { iniset $MANILA_CONF DEFAULT osapi_share_extension manila.api.contrib.standard_extensions iniset $MANILA_CONF DEFAULT state_path $MANILA_STATE_PATH iniset $MANILA_CONF DEFAULT default_share_type $MANILA_DEFAULT_SHARE_TYPE - # TODO(vponomaryov): revert following back in Pike - # iniset $MANILA_CONF DEFAULT default_share_group_type $MANILA_DEFAULT_SHARE_GROUP_TYPE + iniset $MANILA_CONF DEFAULT default_share_group_type $MANILA_DEFAULT_SHARE_GROUP_TYPE if ! [[ -z $MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL ]]; then iniset $MANILA_CONF DEFAULT migration_driver_continue_update_interval $MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL @@ -953,9 +952,8 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then echo_summary "Creating Manila default share type" create_default_share_type - # TODO(vponomaryov): revert following back in Pike - # echo_summary "Creating Manila default share group type" - # create_default_share_group_type + echo_summary "Creating Manila default share group type" + create_default_share_group_type echo_summary "Creating Manila custom share types" create_custom_share_types diff --git a/etc/manila/policy.json b/etc/manila/policy.json index 0b98432f25..e022f7a4dc 100644 --- a/etc/manila/policy.json +++ b/etc/manila/policy.json @@ -116,21 +116,21 @@ "scheduler_stats:pools:index": "rule:admin_api", "scheduler_stats:pools:detail": "rule:admin_api", - "share_group:create" : "!", - "share_group:delete": "!", - "share_group:update": "!", - "share_group:get": "!", - "share_group:get_all": "!", - "share_group:force_delete": "!", - "share_group:reset_status": "!", + "share_group:create" : "rule:default", + "share_group:delete": "rule:default", + "share_group:update": "rule:default", + "share_group:get": "rule:default", + "share_group:get_all": "rule:default", + "share_group:force_delete": "rule:admin_api", + "share_group:reset_status": "rule:admin_api", - "share_group_snapshot:create" : "!", - "share_group_snapshot:delete": "!", - "share_group_snapshot:update" : "!", - "share_group_snapshot:get": "!", - "share_group_snapshot:get_all": "!", - "share_group_snapshot:force_delete": "!", - "share_group_snapshot:reset_status": "!", + "share_group_snapshot:create" : "rule:default", + "share_group_snapshot:delete": "rule:default", + "share_group_snapshot:update" : "rule:default", + "share_group_snapshot:get": "rule:default", + "share_group_snapshot:get_all": "rule:default", + "share_group_snapshot:force_delete": "rule:admin_api", + "share_group_snapshot:reset_status": "rule:admin_api", "share_replica:get_all": "rule:default", "share_replica:show": "rule:default", @@ -142,18 +142,18 @@ "share_replica:force_delete": "rule:admin_api", "share_replica:reset_replica_state": "rule:admin_api", - "share_group_type:index": "!", - "share_group_type:show": "!", - "share_group_type:default": "!", - "share_group_type:create": "!", - "share_group_type:delete": "!", - "share_group_type:add_project_access": "!", - "share_group_type:list_project_access": "!", - "share_group_type:remove_project_access": "!", + "share_group_type:index": "rule:default", + "share_group_type:show": "rule:default", + "share_group_type:default": "rule:default", + "share_group_type:create": "rule:admin_api", + "share_group_type:delete": "rule:admin_api", + "share_group_type:add_project_access": "rule:admin_api", + "share_group_type:list_project_access": "rule:admin_api", + "share_group_type:remove_project_access": "rule:admin_api", - "share_group_types_spec:create": "!", - "share_group_types_spec:update": "!", - "share_group_types_spec:show": "!", - "share_group_types_spec:index": "!", - "share_group_types_spec:delete": "!" + "share_group_types_spec:create": "rule:admin_api", + "share_group_types_spec:update": "rule:admin_api", + "share_group_types_spec:show": "rule:admin_api", + "share_group_types_spec:index": "rule:admin_api", + "share_group_types_spec:delete": "rule:admin_api" }