Skip to content

Commit

Permalink
Remove net-tools installation
Browse files Browse the repository at this point in the history
Now that metal3-io/baremetal-operator#728 has
merged, we can remove net-tools installation command and the netstat
entry in runironic-api.
  • Loading branch information
elfosardo committed Mar 29, 2021
1 parent 26393f5 commit 43d81c2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 1 addition & 4 deletions ironic-scripts/runironic-api
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ while true ; do
sleep 5
done


# TODO: Delete the line of code below and uncomment the next line after the PR https://github.com/metal3-io/baremetal-operator/pull/728 goes in
[ ! "$(netstat -l | grep ${HTTP_PORT})" ] && . /bin/configure-httpd-ipa.sh
# . /bin/configure-httpd-ipa.sh
. /bin/configure-httpd-ipa.sh
# The code above avoids the httpd instance in this container to listen on port HTTP_PORT when it has been opened by BMO.

python3 -c 'import os; import sys; import jinja2; sys.stdout.write(jinja2.Template(sys.stdin.read()).render(env=os.environ))' < /etc/httpd-ironic-api.conf.j2 > /etc/httpd/conf.d/ironic.conf
Expand Down
3 changes: 0 additions & 3 deletions prepare-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ if [[ ! -z ${EXTRA_PKGS_LIST:-} ]]; then
fi
fi

# TODO: Delete the below line of code after the PR https://github.com/metal3-io/baremetal-operator/pull/728 go in
dnf install -y net-tools

dnf clean all
rm -rf /var/cache/{yum,dnf}/*
if [[ ! -z ${PATCH_LIST:-} ]]; then
Expand Down

0 comments on commit 43d81c2

Please sign in to comment.