From 097ac50f7ac4deae639eb1bab7aac1a378d4882b Mon Sep 17 00:00:00 2001 From: Dmitry Bogun Date: Wed, 22 Feb 2017 18:28:17 +0200 Subject: [PATCH] Remove workaround about location of ironic-callback Entry point "bareon-ironic-callback" is managed by python's setuptools. So it's location is predictable. So we can/should remove existing workarounds. Change-Id: I6683f1abbab63553646be53f750a0281b5098391 --- centos-bareon/install.d/60-bareon-install | 4 ---- debian-bareon/install.d/60-bareon-install | 4 ---- 2 files changed, 8 deletions(-) diff --git a/centos-bareon/install.d/60-bareon-install b/centos-bareon/install.d/60-bareon-install index e6fe83f..d046c08 100755 --- a/centos-bareon/install.d/60-bareon-install +++ b/centos-bareon/install.d/60-bareon-install @@ -29,10 +29,6 @@ else rpm -qi bareon >> $RELEASE_FILE fi -if [ ! -f /usr/bin/ironic_callback ]; then - ln -s /usr/local/bin/ironic_callback /usr/bin/ironic_callback -fi - # TODO(lobur): generate this key and publish together with image install -D -g root -o root -m 0600 ${SCRIPTDIR}/files.ironic/root/.ssh/authorized_keys /root/.ssh/authorized_keys chmod 0700 /root/.ssh/ diff --git a/debian-bareon/install.d/60-bareon-install b/debian-bareon/install.d/60-bareon-install index 6bcee5a..a4f9f45 100755 --- a/debian-bareon/install.d/60-bareon-install +++ b/debian-bareon/install.d/60-bareon-install @@ -21,10 +21,6 @@ whl_name=$(ls -1rv dist/bareon*.whl 2>/dev/null | head -1) pip install $whl_name cd / -if [ ! -f /usr/bin/ironic_callback ]; then - ln -s /usr/local/bin/ironic_callback /usr/bin/ironic_callback -fi - echo $'md-mod' >> /etc/modules install -D -g root -o root -m 0600 ${SCRIPTDIR}/files.ironic/root/.ssh/authorized_keys /root/.ssh/authorized_keys