Ensure python2 is installed before hook execution
This commit is contained in:
parent
7baf8a3cf8
commit
9f6b58ca85
@ -95,7 +95,7 @@ hooks = Hooks()
|
||||
CONFIGS = register_configs()
|
||||
|
||||
|
||||
@hooks.hook('install')
|
||||
@hooks.hook('install.real')
|
||||
def install_hook():
|
||||
juju_log('Installing glance packages')
|
||||
execd_preinstall()
|
||||
|
0
hooks/glance_utils.py
Executable file → Normal file
0
hooks/glance_utils.py
Executable file → Normal file
@ -1 +0,0 @@
|
||||
glance_relations.py
|
20
hooks/install
Executable file
20
hooks/install
Executable 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
1
hooks/install.real
Symbolic link
@ -0,0 +1 @@
|
||||
glance_relations.py
|
Loading…
x
Reference in New Issue
Block a user