Skip to content

Align with latest changes upstream #28

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 3, 2020
Merged

Align with latest changes upstream #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions Dockerfile.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM ubi8

RUN yum update -y && \
yum install -y openstack-ironic-inspector crudini psmisc iproute iptables sqlite && \
yum clean all

RUN mkdir -p /var/lib/ironic-inspector && \
sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal"
RUN dnf update -y && \
dnf install -y openstack-ironic-inspector crudini psmisc iproute sqlite && \
mkdir -p /var/lib/ironic-inspector && \
sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \
dnf remove -y sqlite && \
dnf clean all && \
rm -rf /var/cache/{yum,dnf}/*

COPY ./inspector.conf /tmp/inspector.conf
RUN crudini --merge /etc/ironic-inspector/inspector.conf < /tmp/inspector.conf && \
Expand Down
16 changes: 1 addition & 15 deletions runironic-inspector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,6 @@ CONFIG=/etc/ironic-inspector/inspector.conf

wait_for_interface_or_ip

# Allow access to Ironic inspector API
if ! iptables -C INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 5050 -j ACCEPT > /dev/null 2>&1; then
iptables -I INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 5050 -j ACCEPT
fi

# Allow access to mDNS
if ! iptables -C INPUT -i $PROVISIONING_INTERFACE -p udp --dport 5353 -j ACCEPT > /dev/null 2>&1; then
iptables -I INPUT -i $PROVISIONING_INTERFACE -p udp --dport 5353 -j ACCEPT
fi
if ! iptables -C OUTPUT -p udp --dport 5353 -j ACCEPT > /dev/null 2>&1; then
iptables -I OUTPUT -p udp --dport 5353 -j ACCEPT
fi

# Remove log files from last deployment
rm -rf /shared/log/ironic-inspector

Expand All @@ -28,8 +15,7 @@ cp $CONFIG $CONFIG.orig

crudini --set $CONFIG ironic endpoint_override http://$IRONIC_URL_HOST:6385
crudini --set $CONFIG service_catalog endpoint_override http://$IRONIC_URL_HOST:5050
crudini --set $CONFIG mdns interfaces $PROVISIONING_IP

exec /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf \
--config-file /etc/ironic-inspector/inspector.conf \
--log-file /shared/log/ironic-inspector/ironic-inspector.log
--log-file /shared/log/ironic-inspector/ironic-inspector.log