Skip to content

Commit 00ae709

Browse files
raukadahamoralej
andcommitted
Build OpenStack Watcher Container
This pull request: * Builds OpenStack Watcher containers * Add python-watcherclient package to openstackclient container * Add openstack-watcher-ui package to horizon container Note: python-watcherclient and openstack-watcher-ui is not available in downstream currently. It is available in CentOS Stream with RDO antelope release. That's why we have added these packages under tcib_distro conditional to avoid breakage downstream. Jira: https://issues.redhat.com/browse/OSPRH-11085 Co-authored-by: Alfredo Moralejo <[email protected]> Signed-off-by: Chandan Kumar <[email protected]>
1 parent 32df348 commit 00ae709

File tree

8 files changed

+38
-0
lines changed

8 files changed

+38
-0
lines changed

Diff for: container-images/containers.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ container_images:
7777
- imagename: quay.io/podified-master-centos9/openstack-tempest-extras:current-podified
7878
- imagename: quay.io/podified-master-centos9/openstack-tobiko:current-podified
7979
- imagename: quay.io/podified-master-centos9/openstack-openstackclient:current-podified
80+
- imagename: quay.io/podified-master-centos9/openstack-watcher-api:current-podified
81+
- imagename: quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
82+
- imagename: quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified

Diff for: container-images/kolla/base/uid_gid_manage.sh

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ _SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
7171
_SUPPORTED_USERS['tobiko']='tobiko 42495 42495 /var/lib/tobiko kolla'
7272
_SUPPORTED_USERS['tss']='tss 59 59'
7373
_SUPPORTED_USERS['ansible']='ansible 227 227 /var/lib/ansible kolla'
74+
_SUPPORTED_USERS['watcher']='watcher 42451 42451 /var/lib/watcher kolla'
7475

7576
for _USER_TO_CREATE in $_USERS_TO_CREATE; do
7677
# Initialize computed args

Diff for: container-images/tcib/base/openstackclient/openstackclient.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
tcib_actions:
22
- run: rm -rf /home/cloud-admin && bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
33
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
4+
# Note(chandankumar): Remove it once python3-watcherclient is available downstream
5+
- run: >-
6+
if [ '{{ tcib_distro }}' == 'centos' ];then dnf -y install python3-watcherclient && dnf clean all && rm -rf /var/cache/dnf; fi
47
- run: openstack complete | tee /etc/bash_completion.d/osc.bash_completion > /dev/null
58
- run: baremetal complete | tee /etc/bash_completion.d/baremetal.bash_completion > /dev/null
69
# ensure "oc rsh" uses bash by default

Diff for: container-images/tcib/base/os/horizon/horizon.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ tcib_actions:
55
mv /tmp/macros.image-language-conf /etc/rpm &&
66
dnf -y install {{ tcib_packages.common | join(' ') }} &&
77
dnf clean all && rm -rf /var/cache/dnf
8+
# Note(chandankumar): Remove it once openstack-watcher-ui package is available downstream.
9+
- run: >-
10+
if [ '{{ tcib_distro }}' == 'centos' ];then dnf -y install openstack-watcher-ui && dnf clean all && rm -rf /var/cache/dnf; fi
811
- run: cp /usr/share/tcib/container-images/kolla/horizon/extend_start.sh /usr/local/bin/kolla_extend_start
912
- run: chmod 755 /usr/local/bin/kolla_extend_start
1013
- run: >-
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
tcib_actions:
2+
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
3+
- 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
4+
tcib_packages:
5+
common:
6+
- openstack-watcher-api
7+
- httpd
8+
- mod_ssl
9+
- python3-mod_wsgi
10+
tcib_user: watcher
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tcib_actions:
2+
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
3+
tcib_packages:
4+
common:
5+
- openstack-watcher-applier
6+
tcib_user: watcher
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tcib_actions:
2+
- run: bash /usr/local/bin/uid_gid_manage watcher
3+
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
4+
tcib_packages:
5+
common:
6+
- openstack-watcher-common
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tcib_actions:
2+
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
3+
tcib_packages:
4+
common:
5+
- openstack-watcher-decision-engine
6+
tcib_user: watcher

0 commit comments

Comments
 (0)