Set container_binary to podman from stein releases onwards

https://review.openstack.org/#/c/608452/ Switch the undercloud to
deploy Podman by default starting from Stein and
undercloud_container_cli var is setted under undercloud_deploy role
and it cannot be used in another role which will set
container_binary to docker but docker is not there in stein leading
to fail running tempest from container.

Use sudo while pulling tempest using podman

Change-Id: I7ee75d71a7c34bdb85232a1378880ff16579c5db
Related-Bug: #1816026
This commit is contained in:
Chandan Kumar 2019-02-18 19:28:49 +05:30
parent def233448d
commit d1fd33e82f
1 changed files with 4 additions and 4 deletions

View File

@ -65,8 +65,8 @@ sudo cp $RCFILE \
{{ working_dir }}/tempest_container.sh \
$TEMPEST_HOST_DATA
{% if undercloud_container_cli is defined %}
export CONTAINER_BINARY={{ undercloud_container_cli }}
{% if release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] %}
export CONTAINER_BINARY='podman'
{% else %}
export CONTAINER_BINARY='docker'
{% endif %}
@ -74,8 +74,8 @@ export CONTAINER_BINARY='docker'
sudo $CONTAINER_BINARY pull {{ tempest_container_registry }}/{{ tempest_container_namespace }}:{{ tempest_container_tag }}
{% if tempest_use_headless_chrome|bool %}
docker pull selenium/standalone-chrome
docker run -d \
sudo $CONTAINER_BINARY pull selenium/standalone-chrome
sudo $CONTAINER_BINARY run -d \
-p {{ tempest_headless_chrome_port }}:{{ tempest_headless_chrome_port }} \
-v /dev/shm:/dev/shm selenium/standalone-chrome
{% endif %}