Browse Source

[train-only] add ec2-api image into TCIB

Adding an image layout so we continue to ship ec2api container image in
TCIB, like we did for Kolla before.

Note about the image: it doesn't have healthcheck (never did).

Change-Id: Ib2c5c655d6851754e93da1e5739674cd28064ea2
Closes-Bug: #1894126
changes/83/749783/2
Emilien Macchi 3 weeks ago
parent
commit
d1aa08100c
4 changed files with 19 additions and 0 deletions
  1. +1
    -0
      container-images/kolla/base/uid_gid_manage.sh
  2. +3
    -0
      container-images/kolla/ec2-api/extend_start.sh
  3. +13
    -0
      container-images/tcib/base/os/ec2-api/ec2-api.yaml
  4. +2
    -0
      container-images/tripleo_containers.yaml

+ 1
- 0
container-images/kolla/base/uid_gid_manage.sh View File

@@ -39,6 +39,7 @@ _SUPPORTED_USERS['ceilometer']='ceilometer 42405 42405 /var/lib/ceilometer kolla
_SUPPORTED_USERS['cinder']='cinder 42407 42407 /var/lib/cinder kolla'
_SUPPORTED_USERS['collectd']='collectd 42409 42409 /var/lib/collectd kolla'
_SUPPORTED_USERS['designate']='designate 42411 42411 /var/lib/designate kolla'
_SUPPORTED_USERS['ec2api']='ec2api 42466 42466 /var/lib/ec2api kolla'
_SUPPORTED_USERS['etcd']='etcd 42413 42413 /var/lib/etcd kolla'
_SUPPORTED_USERS['glance']='glance 42415 42415 /var/lib/glance kolla'
_SUPPORTED_USERS['gnocchi']='gnocchi 42416 42416 /var/lib/gnocchi kolla'


+ 3
- 0
container-images/kolla/ec2-api/extend_start.sh View File

@@ -0,0 +1,3 @@
#!/bin/bash

. /usr/local/bin/kolla_httpd_setup

+ 13
- 0
container-images/tcib/base/os/ec2-api/ec2-api.yaml View File

@@ -0,0 +1,13 @@
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
- copy: /usr/share/tripleo-common/container-images/kolla/ec2-api/extend_start.sh /usr/local/bin/kolla_extend_start
- run: chmod 755 /usr/local/bin/kolla_extend_start
- run: sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
tcib_gather_files: '{{ lookup(''fileglob'', ''/usr/share/tripleo-common/container-images/kolla/ec2-api/*'', wantlist=True) }}'
tcib_packages:
common:
- httpd
- mod_ssl
- openstack-ec2-api
tcib_user: ec2api

+ 2
- 0
container-images/tripleo_containers.yaml View File

@@ -61,6 +61,8 @@ container_images:
imagename: quay.io/tripleotrain/openstack-designate-sink:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-designate-worker:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-ec2-api:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/openstack-etcd:current-tripleo
- image_source: tripleo


Loading…
Cancel
Save