diff --git a/hooks/install b/hooks/install deleted file mode 120000 index 1fb10fd5..00000000 --- a/hooks/install +++ /dev/null @@ -1 +0,0 @@ -neutron_api_hooks.py \ No newline at end of file diff --git a/hooks/install b/hooks/install new file mode 100755 index 00000000..f5f2623c --- /dev/null +++ b/hooks/install @@ -0,0 +1,20 @@ +#!/bin/bash +# Wrapper to deal with newer Ubuntu versions that don't have py2 installed +# by default. + +declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml') + +check_and_install() { + pkg="${1}-${2}" + if ! dpkg -s ${pkg} 2>&1 > /dev/null; then + apt-get -y install ${pkg} + fi +} + +PYTHON="python" + +for dep in ${DEPS[@]}; do + check_and_install ${PYTHON} ${dep} +done + +exec ./hooks/neutron_api_hooks.py diff --git a/hooks/neutron_api_hooks.py b/hooks/neutron_api_hooks.py index 44b3e149..b678ec09 100755 --- a/hooks/neutron_api_hooks.py +++ b/hooks/neutron_api_hooks.py @@ -1,4 +1,4 @@ -#!./hooks/python2or3 +#!/usr/bin/python import sys import uuid diff --git a/hooks/python2or3 b/hooks/python2or3 deleted file mode 100755 index 8e1c8079..00000000 --- a/hooks/python2or3 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Wrapper to deal with newer Ubuntu versions that don't have py2 installed -# by default. -# TODO: make this really do python3 when the charm codebase supports it. - -declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml') - -check_and_install() { - pkg="${1}-${2}" - if ! dpkg -s ${pkg} 2>&1 > /dev/null; then - apt-get -y install ${pkg} - fi -} - -PYTHON="python" - -for dep in ${DEPS[@]}; do - check_and_install ${PYTHON} ${dep} -done - -exec /usr/bin/python $@