commit 613df5a1a733bc8917af8891a380846774dbfcde
author ibumarskov <ibumarskov@mirantis.com> Wed Jun 26 14:45:55 2019 +0400
committer Ilya Bumarskov <ibumarskov@mirantis.com> Tue Jul 16 13:45:22 2019 +0000
tree bd85b74468f0afa7a4cf021e7c08bdcfa0fe93e2
parent 80d4146f2ab29c6d22b2f1232190c89e94275270

Update contrail's policy file and switch patrole to "queens" branch

Depends-On: https://gerrit.mcp.mirantis.com/41607
Depends-On: https://gerrit.mcp.mirantis.com/44714
Change-Id: I7b6610744152d0158088f0ee8cbaba756615b560
Related-PROD: PROD-31393

Rebuild_file

diff --git a/Rebuild_file b/Rebuild_file
index 6e52990..0059af5 100644
--- a/Rebuild_file
+++ b/Rebuild_file
@@ -1 +1 @@
-11.06.2019 Maksym Shalamov
+02.07.2019 Ilya Bumarskov

bin/opencontrail/policy.json

diff --git a/bin/opencontrail/policy.json b/bin/opencontrail/policy.json
index c2ab0ab..4d2ab21 100644
--- a/bin/opencontrail/policy.json
+++ b/bin/opencontrail/policy.json
@@ -290,5 +290,25 @@
     "create_virtual_networks": "role:admin",
     "update_virtual_network": "role:admin",
     "delete_virtual_network": "role:admin",
-    "show_virtual_network": "role:admin"
+    "show_virtual_network": "role:admin",
+    "list_bgpvpns": "role:admin",
+    "create_bgpvpns": "role:admin",
+    "show_bgpvpn": "role:admin",
+    "delete_bgpvpn": "role:admin",
+    "update_bgpvpn": "role:admin",
+    "create_policy_management": "role:admin",
+    "list_policy_management": "role:admin",
+    "show_policy_management": "role:admin",
+    "delete_policy_management": "role:admin",
+    "update_policy_management": "role:admin",
+    "list_service_objects": "role:admin",
+    "create_service_object": "role:admin",
+    "show_service_object": "role:admin",
+    "delete_service_object": "role:admin",
+    "update_service_object": "role:admin",
+    "list_tag_types": "role:admin",
+    "show_tag_type": "role:admin",
+    "create_tag_types": "role:admin",
+    "update_tag_type": "role:admin",
+    "delete_tag_type": "role:admin"
 }

extra/pre-build.sh

diff --git a/extra/pre-build.sh b/extra/pre-build.sh
index 30c122c..2ac5f6f 100755
--- a/extra/pre-build.sh
+++ b/extra/pre-build.sh
@@ -26,7 +26,7 @@
 export MANILA_TAG="${MANILA_TAG:-mcp/queens}"
 export TELEMETRY_TAG="${TELEMETRY_TAG:-mcp/queens}"
 export OCTAVIA_TAG="${OCTAVIA_TAG:-mcp/queens}"
-export PATROLE_TAG="${PATROLE_TAG:-0.4.x}"
+export PATROLE_TAG="${PATROLE_TAG:-mcp/queens}"
 export TUNGSTEN_TAG="${TUNGSTEN_TAG:-0.1.x}"
 # global openstack requirements repo
 # This is the commit where tempest version is 18.0.0 in u-c