Add python3-pip to install hook to support trusty fresh installs.

Reviewed-on: https://code.launchpad.net/~afreiberger/charm-mongodb/+git/mongodb-charm/+merge/387959 Reviewed-by: Xav Paice <xav.paice@canonical.com> Reviewed-by: Giuseppe Petralia <giuseppe.petralia@canonical.com> 

2 files changed, 16 insertions, 11 deletions

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 275a0ba..0c7798b 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -9,7 +9,6 @@ import collections
 import distutils
 import json
 import os
-import pip
 import pprint
 import re
 import signal
@@ -19,13 +18,7 @@ import sys
 import time
 
 try:
- import distro
-except ImportError:
- pip.main(['install', "distro"])
- import distro
-
-try:
- import yaml
+ import yaml # flake8: noqa
 except ImportError:
 if sys.version_info.major == 2:
 subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
@@ -92,6 +85,18 @@ except ImportError:
 from pymongo import MongoClient
 from pymongo.errors import OperationFailure
 
+try:
+ import pip # flake8: noqa
+except ImportError:
+ apt_install('python3-pip', fatal=True)
+ import pip # flake8: noqa
+
+try:
+ import distro # flake8: noqa
+except ImportError:
+ pip.main(['install', "distro"])
+ import distro # flake8: noqa
+
 from charmhelpers.contrib.charmsupport.nrpe import NRPE
 
 hooks = Hooks()
@@ -965,8 +970,8 @@ def install_hook():
 apt_install(packages=INSTALL_PACKAGES, fatal=True)
 
 
-@hooks.hook('config-changed') # noqa: C901
-def config_changed():
+@hooks.hook('config-changed')
+def config_changed(): # noqa: C901
 juju_log("Entering config_changed")
 status_set('maintenance', 'Configuring unit')
 config_data = config()
diff --git a/hooks/install b/hooks/install
index baffb57..8a1f051 100755
--- a/hooks/install
+++ b/hooks/install
@@ -2,7 +2,7 @@
 # Wrapper to deal with newer Ubuntu versions that don't have py2 installed
 # by default.
 
-declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'python3-pip')
 
 wait_for_dpkg_unlock() {
 while $(fuser -s /var/lib/dpkg/lock); do sleep .5;done