Skip to content

Commit 7cfe125

Browse files
committed
Enable watcher for downstream
Watcher related packages are available downstream. This pr removes the centos conditional for the same. Realted-Jira: https://issues.redhat.com/browse/OSPRH-12829 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
1 parent 3e8d270 commit 7cfe125

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
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
74
- run: openstack complete | tee /etc/bash_completion.d/osc.bash_completion > /dev/null
85
- run: baremetal complete | tee /etc/bash_completion.d/baremetal.bash_completion > /dev/null
96
# ensure "oc rsh" uses bash by default
@@ -23,6 +20,7 @@ tcib_packages:
2320
- python3-observabilityclient
2421
- python3-octaviaclient
2522
- python3-aodhclient
23+
- python3-watcherclient
2624
- bash-completion
2725
- iputils
2826
- ipmitool

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ 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
118
- run: cp /usr/share/tcib/container-images/kolla/horizon/extend_start.sh /usr/local/bin/kolla_extend_start
129
- run: chmod 755 /usr/local/bin/kolla_extend_start
1310
- run: >-
@@ -36,3 +33,4 @@ tcib_packages:
3633
- openstack-manila-ui
3734
- openstack-octavia-ui
3835
- openstack-designate-ui
36+
- openstack-watcher-ui

0 commit comments

Comments
 (0)