From e31e466f763ec0e2347cc4a29eaa74e47513d937 Mon Sep 17 00:00:00 2001
From: "zhu.boxiang" <zhu.boxiang@99cloud.net>
Date: Wed, 22 Jun 2022 21:54:39 +0800
Subject: [PATCH] feat: Remove patch for barbican and update policy

1. remove patch for barbican
2. update heat policy
3. update requirements version

Depends-On: https://review.opendev.org/c/openstack/heat/+/812662
Depends-On: https://review.opendev.org/c/openstack/barbican/+/839147
Change-Id: I8f690c7c1e41cd78199de6386e986512edca9259
---
 requirements.txt                         | 2 +-
 skyline_apiserver/policy/manager/heat.py | 5 +++++
 tools/post_install.sh                    | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 807c61c..a2a52fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ python-glanceclient>=2.17.1,<=4.0.0 # Apache-2.0
 python-neutronclient>=6.14.1,<=7.8.0 # Apache-2.0
 python-novaclient>=15.1.1,<=18.0.0 # Apache-2.0
 keystoneauth1>=3.17.4,<=4.6.0 # Apache-2.0
-oslo.policy>=2.3.4,<=3.12.1 # Apache-2.0
+oslo.policy>=2.3.4 # Apache-2.0
diff --git a/skyline_apiserver/policy/manager/heat.py b/skyline_apiserver/policy/manager/heat.py
index 42dcbe8..4628514 100644
--- a/skyline_apiserver/policy/manager/heat.py
+++ b/skyline_apiserver/policy/manager/heat.py
@@ -159,6 +159,11 @@ list_rules = (
         check_str=("rule:project_admin"),
         description="No description",
     ),
+    base.Rule(
+        name="resource_types:OS::Neutron::QoSMinimumPacketRateRule",
+        check_str=("rule:project_admin"),
+        description="No description",
+    ),
     base.Rule(
         name="resource_types:OS::Neutron::Segment",
         check_str=("rule:project_admin"),
diff --git a/tools/post_install.sh b/tools/post_install.sh
index b9a7048..1e4bfc3 100755
--- a/tools/post_install.sh
+++ b/tools/post_install.sh
@@ -32,8 +32,3 @@ for deprecated_project in ${INSTALL_DEPRECATED_PROJECTS}
 do
     pip install -U ${deprecated_project}
 done
-
-# Patch barbican
-# https://review.opendev.org/c/openstack/barbican/+/839147
-patch_path="$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')/barbican/common/policies/secrets.py"
-sed -i "s/'GET\"'/'GET'/g" $patch_path