From 9318d1ec58552603fc9f624ec07f2752bcfbc428 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 24 Jan 2020 20:59:03 +0100 Subject: [PATCH] Generate /etc/glance/policy.json MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It takes into account the following change in glance [1] [1] https://github.com/openstack/glance/commit/5c17e4c7ef533b57ba15ead931b0452e23f46b4b#diff-335462891f7178710c6ca7185f9f877c Change-Id: I61e37cd2383620fa6db665f1858830b9c5d13938 Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 16b9f52c6..e62a35076 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -56,11 +56,12 @@ RUN apk --no-cache add --update libxml2 libxslt && \ /src/octavia-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ - wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - oslo.policy -e git+https://opendev.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \ + oslo.policy -e git+https://opendev.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron \ + -e git+https://opendev.org/openstack/glance.git@$OPENSTACK_TAG#egg=glance && \ oslopolicy-sample-generator --format json --output-file /etc/neutron/policy.json --namespace neutron && \ + oslopolicy-sample-generator --format json --output-file /etc/glance/policy.json --namespace glance && \ deactivate && \ rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ -- 2.16.6