Revert

hooks/nova_compute_hooks.py

@@ -1,4 +1,4 @@
-#!./hooks/python2or3
+#!/usr/bin/python
 import sys
 
 from charmhelpers.core.hookenv import (

hooks/python2or3

@@ -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 $@