Merge pull request metal3-io#566 from Prashanth684/ironic-okd

NO-ISSUE: fix scos and fcos dockerfiles to remove ironic-inspector
iurygregory · Aug 23, 2024 · 599d8b4 · 599d8b4
2 parents e451221 + e8589a6
commit 599d8b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/Dockerfile.fcos b/Dockerfile.fcos
@@ -42,15 +42,10 @@ COPY ironic-config/apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2
 COPY ironic-config/apache2-proxy.conf.j2 /etc/httpd-proxy.conf.j2
 COPY ironic-config/apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2
 
-RUN mkdir -p /var/lib/ironic /var/lib/ironic-inspector && \
+RUN mkdir -p /var/lib/ironic && \
  sqlite3 /var/lib/ironic/ironic.db "pragma journal_mode=wal" && \
- sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \
  dnf remove -y sqlite
 
-# IRONIC-INSPECTOR #
-COPY ironic-inspector-config/ironic-inspector.conf.j2 /etc/ironic-inspector/
-COPY ironic-inspector-config/inspector-apache.conf.j2 /etc/httpd/conf.d/
-
 # configure non-root user and set relevant permissions
 RUN configure-nonroot.sh && \
  rm -f /bin/configure-nonroot.sh

diff --git a/Dockerfile.scos b/Dockerfile.scos
@@ -42,15 +42,10 @@ COPY ironic-config/apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2
 COPY ironic-config/apache2-proxy.conf.j2 /etc/httpd-proxy.conf.j2
 COPY ironic-config/apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2
 
-RUN mkdir -p /var/lib/ironic /var/lib/ironic-inspector && \
+RUN mkdir -p /var/lib/ironic && \
  sqlite3 /var/lib/ironic/ironic.db "pragma journal_mode=wal" && \
- sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \
  dnf remove -y sqlite
 
-# IRONIC-INSPECTOR #
-COPY ironic-inspector-config/ironic-inspector.conf.j2 /etc/ironic-inspector/
-COPY ironic-inspector-config/inspector-apache.conf.j2 /etc/httpd/conf.d/
-
 # configure non-root user and set relevant permissions
 RUN configure-nonroot.sh && \
  rm -f /bin/configure-nonroot.sh