Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.0-fr1] Build openstack-watcher container #247

Open
wants to merge 1 commit into
base: 18.0-fr1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions container-images/containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,6 @@ container_images:
- imagename: quay.io/podified-master-centos9/openstack-tempest-extras:current-podified
- imagename: quay.io/podified-master-centos9/openstack-tobiko:current-podified
- imagename: quay.io/podified-master-centos9/openstack-openstackclient:current-podified
- imagename: quay.io/podified-master-centos9/openstack-watcher-api:current-podified
- imagename: quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
- imagename: quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
1 change: 1 addition & 0 deletions container-images/kolla/base/uid_gid_manage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ _SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
_SUPPORTED_USERS['tobiko']='tobiko 42495 42495 /var/lib/tobiko kolla'
_SUPPORTED_USERS['tss']='tss 59 59'
_SUPPORTED_USERS['ansible']='ansible 227 227 /var/lib/ansible kolla'
_SUPPORTED_USERS['watcher']='watcher 42451 42451 /var/lib/watcher kolla'

for _USER_TO_CREATE in $_USERS_TO_CREATE; do
# Initialize computed args
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
tcib_actions:
- run: rm -rf /home/cloud-admin && 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
# Note(chandankumar): Remove it once python3-watcherclient is available downstream
- run: >-
if [ '{{ tcib_distro }}' == 'centos' ];then dnf -y install python3-watcherclient && dnf clean all && rm -rf /var/cache/dnf; fi
- run: openstack complete | tee /etc/bash_completion.d/osc.bash_completion > /dev/null
- run: baremetal complete | tee /etc/bash_completion.d/baremetal.bash_completion > /dev/null
# ensure "oc rsh" uses bash by default
Expand Down
3 changes: 3 additions & 0 deletions container-images/tcib/base/os/horizon/horizon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ tcib_actions:
mv /tmp/macros.image-language-conf /etc/rpm &&
dnf -y install {{ tcib_packages.common | join(' ') }} &&
dnf clean all && rm -rf /var/cache/dnf
# Note(chandankumar): Remove it once openstack-watcher-ui package is available downstream.
- run: >-
if [ '{{ tcib_distro }}' == 'centos' ];then dnf -y install openstack-watcher-ui && dnf clean all && rm -rf /var/cache/dnf; fi
- run: cp /usr/share/tcib/container-images/kolla/horizon/extend_start.sh /usr/local/bin/kolla_extend_start
- run: chmod 755 /usr/local/bin/kolla_extend_start
- run: >-
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- 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_packages:
common:
- openstack-watcher-api
- httpd
- mod_ssl
- python3-mod_wsgi
tcib_user: watcher
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
tcib_packages:
common:
- openstack-watcher-applier
tcib_user: watcher
6 changes: 6 additions & 0 deletions container-images/tcib/base/os/watcher-base/watcher-base.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tcib_actions:
- run: bash /usr/local/bin/uid_gid_manage watcher
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
tcib_packages:
common:
- openstack-watcher-common
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
tcib_packages:
common:
- openstack-watcher-decision-engine
tcib_user: watcher