Merge "Re-add tripleoclient and tempest container"

container-images/kolla/base/uid_gid_manage.sh

@@ -70,6 +70,7 @@ _SUPPORTED_USERS['qemu']='qemu 107 107'
 _SUPPORTED_USERS['rabbitmq']='rabbitmq 42439 42439 /var/lib/rabbitmq kolla'
 _SUPPORTED_USERS['redis']='redis 42460 42460 /run/redis kolla'
 _SUPPORTED_USERS['swift']='swift 42445 42445 /var/lib/swift kolla'
+_SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
 _SUPPORTED_USERS['zaqar']='zaqar 42452 42452 /var/lib/zaqar kolla'
 
 for _USER_TO_CREATE in $_USERS_TO_CREATE; do

container-images/tcib/base/os/tempest/tempest.yaml

@@ -0,0 +1,8 @@
+tcib_actions:
+- run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
+- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
+tcib_packages:
+  common:
+  - iputils
+  - openstack-tempest-all
+tcib_user: tempest

container-images/tripleo_containers.yaml

@@ -187,3 +187,7 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-unbound:current-tripleo
   image_source: tripleo
+- imagename: quay.io/tripleomaster/openstack-tempest:current-tripleo
+  image_source: tripleo
+- imagename: quay.io/tripleomaster/openstack-tripleoclient:current-tripleo
+  image_source: tripleo

container-images/tripleo_containers.yaml.j2

@@ -813,3 +813,17 @@ container_images_template:
   - ContainerUnboundConfigImage
   services:
   - OS::TripleO::Services::Unbound
+
+- imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}"
+  image_source: tripleo
+  params:
+  - ContainerTempestImage
+  services:
+  - OS::TripleO::Services::Tempest
+
+- imagename: "{{namespace}}/{{name_prefix}}tripleoclient{{name_suffix}}:{{tag}}"
+  image_source: tripleo
+  params:
+  - ContainerTripleoClientImage
+  services:
+  - OS::TripleO::Services::TripleoClient