Merge "Fix security context for glance rally tests"

glance/templates/pod-rally-test.yaml

@@ -91,6 +91,8 @@ spec:
           readOnly: true
         - name: rally-db
           mountPath: /var/lib/rally
+        - name: rally-work
+          mountPath: /home/rally/.rally
 {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
   volumes:
     - name: pod-tmp
@@ -105,5 +107,7 @@ spec:
         defaultMode: 0555
     - name: rally-db
       emptyDir: {}
+    - name: rally-work
+      emptyDir: {}
 {{ if $mounts_tests.volumes }}{{ toYaml $mounts_tests.volumes | indent 4 }}{{ end }}
 {{- end }}

glance/values.yaml

@@ -103,7 +103,8 @@ conf:
         - args:
             container_format: bare
             disk_format: qcow2
-            image_location: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+            # NOTE(aostapenko) temporary location to work around https://bugs.launchpad.net/rally/+bug/1887705
+            image_location: https://artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img
           runner:
             concurrency: 1
             times: 1
@@ -115,7 +116,8 @@ conf:
         - args:
             container_format: bare
             disk_format: qcow2
-            image_location: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+            # NOTE(aostapenko) temporary location to work around https://bugs.launchpad.net/rally/+bug/1887705
+            image_location: https://artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img
           runner:
             concurrency: 1
             times: 1
@@ -870,6 +872,7 @@ pod:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
         glance_test:
+          runAsUser: 65500
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
   affinity:

tools/deployment/component/glance/glance.sh

@@ -59,3 +59,5 @@ openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack image list
 openstack image show 'Cirros 0.3.5 64-bit'
+
+helm test glance --timeout 900