Skip to content

Commit

Permalink
Merge pull request metal3-io#488 from elfosardo/remove-prometheus-exp…
Browse files Browse the repository at this point in the history
…orter-413

OCPBUGS-32363: [4.13] remove unused prometheus-exporter
  • Loading branch information
openshift-merge-bot[bot] authored Apr 30, 2024
2 parents c4299c5 + 7f0c63b commit 881e793
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.fcos
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ COPY ${PKGS_LIST} ${EXTRA_PKGS_LIST:-$PKGS_LIST} /tmp/
COPY prepare-image.sh prepare-ipxe.sh /bin/

# Configure OpenStack repos
RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/main-packages-list.ocp && \
dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo
RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/${PKGS_LIST} && \
curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo && \
curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos9-master/delorean-deps.repo

RUN prepare-image.sh && \
rm -f /bin/prepare-image.sh && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.scos
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ COPY ${PKGS_LIST} ${EXTRA_PKGS_LIST:-$PKGS_LIST} /tmp/
COPY prepare-image.sh prepare-ipxe.sh /bin/

# Configure OpenStack repos
RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/main-packages-list.ocp && \
dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \
curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo
RUN sed -E -i 's/( =.*| >=.*)//g' /tmp/${PKGS_LIST} && \
curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo && \
curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos9-master/delorean-deps.repo

RUN prepare-image.sh && \
rm -f /bin/prepare-image.sh && \
Expand Down
2 changes: 0 additions & 2 deletions main-packages-list.ocp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ python3-debtcollector >= 2.5.0-0.20221128140303.a6b46c5.el9
python3-dracclient >= 8.0.0-0.20221128135758.9c7499c.el
python3-eventlet >= 0.33.1-5.el9
python3-flask >= 2:2.0.1-4.el9.2
python3-gunicorn >= 20.0.4-2.el9
python3-ironic-lib >= 5.4.1-0.20230410165532.b393f4c.el9
python3-ironic-prometheus-exporter >= 3.1.1-0.20221128155706.eb27243.el9
python3-ironicclient >= 4.9.0-0.20211209154934.6f1be06.el9
python3-jinja2 >= 2-3.0.1-2.el9.1
python3-keystoneauth1 >= 5.0.0-0.20221128144522.2445a5d.el9
Expand Down

0 comments on commit 881e793

Please sign in to comment.