Ensure python2 is installed before hook execution

This commit is contained in:
James Page 2015-09-22 14:52:12 +01:00
parent 1b0318076f
commit f26a5ab508
3 changed files with 22 additions and 2 deletions

View File

@ -1 +0,0 @@
nova_cc_hooks.py

20
hooks/install Executable file
View File

@ -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/install.real

1
hooks/install.real Symbolic link
View File

@ -0,0 +1 @@
nova_cc_hooks.py

View File

@ -144,7 +144,7 @@ AGENT_CA_PARAMS = 'op monitor interval="5s"'
NOVA_CONSOLEAUTH_OVERRIDE = '/etc/init/nova-consoleauth.override'
@hooks.hook()
@hooks.hook('install.real')
def install():
execd_preinstall()
configure_installation_source(config('openstack-origin'))