Merge lp:~wgrant/charms/trusty/turnip/single-dir into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel

[William Grant]

Move the /srv/* directories down into a configurable base_dir, defaulting to /srv/turnip.

[Kit Randel (blr)]

Much tidier, thanks.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-02-27 18:13:29 +0000
+++ Makefile	2015-03-05 06:48:41 +0000
@@ -43,7 +43,6 @@
 
 pip-cache: fetch-code
 	@echo "Updating python dependency cache..."
-	@sudo apt-get install -qq -y python-pip
 	@mkdir -p $(PIP_CACHE)
 	@pip install --no-use-wheel --download $(PIP_CACHE) -r $(SOURCE_DIR)/requirements.txt	
 
@@ -69,7 +68,6 @@
 
 
 setup: clean
-	@sudo apt-get install -qq -y python-virtualenv
 ifeq ($(wildcard .venv),)
 	@echo "Creating virtualenv in .venv"
 	@virtualenv .venv --python=/usr/bin/python3

=== modified file 'config.yaml'
--- config.yaml	2015-03-02 14:21:35 +0000
+++ config.yaml	2015-03-05 06:48:41 +0000
@@ -41,19 +41,7 @@
     type: string
     default: '1'
     description: Current bzr revision.
-  data_dir:
-    type: string
-    default: '/srv/data'
-    description: Repository data directory; block storage mount on staging/production.
-  env_dir:
-    type: string
-    default: '/srv/envs'
-    description: Envar exports.
-  log_dir:
-    type: string
-    default: '/srv/logs'
-    description: Log directory.
-  srv_dir:
+  base_dir:
     type: string
     default: '/srv/turnip'
     description: Root checkout/srv directory.

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-02 14:21:35 +0000
+++ hooks/actions.py	2015-03-05 06:48:41 +0000
@@ -15,8 +15,12 @@
 # Globals
 CHARM_FILES_DIR = os.path.join(hookenv.charm_dir(), 'files')
 REQUIRED_PACKAGES = ['python-virtualenv', 'python-dev', 'python-pygit2']
-APP = config['app_name']
-SRV_DIR = config['srv_dir']
+BASE_DIR = config['base_dir']
+CODE_DIR = os.path.join(BASE_DIR, 'code')
+VENV_DIR = os.path.join(BASE_DIR, 'venv')
+LOGS_DIR = os.path.join(BASE_DIR, 'logs')
+DATA_DIR = os.path.join(BASE_DIR, 'data')
+
 CODE_USER = config['code_user']
 CODE_GROUP = config['code_group']
 USER = config['user']
@@ -31,14 +35,10 @@
 def make_srv_location():
     hookenv.log('Creating directories...')
 
-    data_dir = config['data_dir']
-    log_dir = config['log_dir']
-    deploymgr_dir = os.path.join(os.sep, 'srv', 'deploymgr')
-
-    for dir in (deploymgr_dir, SRV_DIR):
-        host.mkdir(dir, owner=CODE_USER, group=CODE_GROUP, perms=0o775)
-    for dir in (data_dir, log_dir):
-        host.mkdir(dir, owner=USER, group=GROUP, perms=0o775)
+    for dir in (BASE_DIR, CODE_DIR):
+        host.mkdir(dir, owner=CODE_USER, group=CODE_GROUP, perms=0o755)
+    for dir in (LOGS_DIR, DATA_DIR):
+        host.mkdir(dir, owner=USER, group=GROUP, perms=0o755)
 
 
 def create_users(service_name):
@@ -57,17 +57,17 @@
     make_srv_location()
 
     # Copy source archive
-    archive_path = os.path.join(SRV_DIR, '%s.tar.gz' % APP)
+    archive_path = os.path.join(BASE_DIR, 'turnip.tar.gz')
 
-    with open(os.path.join(CHARM_FILES_DIR, '%s.tar.gz' % APP)) as file:
+    with open(os.path.join(CHARM_FILES_DIR, 'turnip.tar.gz')) as file:
         host.write_file(archive_path, file.read(), perms=0o644)
 
     # Unpack source
-    archive.extract_tarfile(archive_path, os.path.join(SRV_DIR))
+    archive.extract_tarfile(archive_path, os.path.join(CODE_DIR))
     os.chown(
-        SRV_DIR,
+        CODE_DIR,
         pwd.getpwnam(CODE_USER).pw_uid, grp.getgrnam(CODE_GROUP).gr_gid)
-    host.lchownr(SRV_DIR, CODE_USER, CODE_GROUP)
+    host.lchownr(CODE_DIR, CODE_USER, CODE_GROUP)
 
 
 def install_packages(service_name):
@@ -78,21 +78,22 @@
 
 def install_python_packages(service_name):
     hookenv.log('Installing python packages...')
-    env_dir = os.path.join(SRV_DIR, 'env')
     pip_cache = os.path.join(CHARM_FILES_DIR, 'pip-cache')
-    requirements = os.path.join(SRV_DIR, 'requirements.txt')
-
-    subprocess.call(['virtualenv', '--system-site-packages', env_dir])
-    for dirpath, dirname, files in os.walk(pip_cache):
-        if files:
-            hookenv.log('Installing from download cache.')
-            subprocess.call(['%s/bin/pip' % env_dir,
-                             'install',
-                             '--no-index',
-                             '--find-links={}'.format(pip_cache),
-                             '-r', requirements])
-        else:
-            subprocess.call(['%s/bin/pip' % env_dir,
-                             'install', '-r', requirements])
-    subprocess.call(['%s/bin/pip' % env_dir,
-                    'install', '--no-deps', '-e', SRV_DIR])
+    requirements = os.path.join(CODE_DIR, 'requirements.txt')
+
+    pip_bin = os.path.join(VENV_DIR, 'bin', 'pip')
+
+    subprocess.call([
+        'sudo', '-u', CODE_USER, 'virtualenv', '--system-site-packages',
+        VENV_DIR])
+    if os.listdir(pip_cache):
+        hookenv.log('Installing from download cache.')
+        subprocess.call([
+            'sudo', '-u', CODE_USER, pip_bin, 'install', '--no-index',
+            '--find-links={}'.format(pip_cache), '-r', requirements])
+    else:
+        subprocess.call([
+            'sudo', '-u', CODE_USER, pip_bin, 'install', '-r', requirements])
+    subprocess.call([
+        'sudo', '-u', CODE_USER, pip_bin, 'install', '--no-deps',
+        '-e', CODE_DIR])

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-02 14:21:35 +0000
+++ hooks/services.py	2015-03-05 06:48:41 +0000
@@ -1,3 +1,5 @@
+import os
+
 from charmhelpers.core import hookenv
 from charmhelpers.core.services.base import ServiceManager
 from charmhelpers.core.services import helpers
@@ -9,7 +11,7 @@
 def render_env_template(config, name):
     return helpers.render_template(
         source='envs/{}.j2'.format(name),
-        target='{}/{}'.format(config['env_dir'], name),
+        target='{}/{}'.format(os.path.join(config['base_dir'], 'envs'), name),
         owner=config['code_user'],
         group=config['code_group'])
 

=== modified file 'templates/envs/REPO_STORE.j2'
--- templates/envs/REPO_STORE.j2	2015-02-28 00:27:07 +0000
+++ templates/envs/REPO_STORE.j2	2015-03-05 06:48:41 +0000
@@ -1,1 +1,1 @@
-{{ data_dir }}
+{{ base_dir }}/data/repos

=== modified file 'templates/envs/TURNIP_LOG_DIR.j2'
--- templates/envs/TURNIP_LOG_DIR.j2	2015-03-02 11:25:29 +0000
+++ templates/envs/TURNIP_LOG_DIR.j2	2015-03-05 06:48:41 +0000
@@ -1,1 +1,1 @@
-{{ log_dir }}
\ No newline at end of file
+{{ base_dir }}/logs

=== modified file 'templates/turnip-api.conf.j2'
--- templates/turnip-api.conf.j2	2015-02-27 18:13:29 +0000
+++ templates/turnip-api.conf.j2	2015-03-05 06:48:41 +0000
@@ -4,13 +4,13 @@
 setuid {{ user }}
 setgid {{ group }}
 
-env PYTHON_HOME=/srv/{{ app_name }}/env
+env PYTHON_HOME={{ base_dir }}/venv
 env PATH=$PYTHON_HOME/bin:$PATH
 
-start on started turnip
-stop on stopping turnip
+start on started {{ app_name }}
+stop on stopping {{ app_name }}
 
-chdir /srv/{{ app_name }}
-exec $PYTHON_HOME/bin/envdir {{ env_dir }} $PYTHON_HOME/bin/pserve api.ini
+chdir {{ base_dir }}/code
+exec $PYTHON_HOME/bin/envdir {{ base_dir }}/envs $PYTHON_HOME/bin/pserve api.ini
 
 respawn

=== modified file 'templates/turnip.conf.j2'
--- templates/turnip.conf.j2	2015-02-27 12:27:16 +0000
+++ templates/turnip.conf.j2	2015-03-05 06:48:41 +0000
@@ -4,13 +4,13 @@
 setuid {{ user }}
 setgid {{ group }}
 
-env PYTHON_HOME=/srv/{{ app_name }}/env
+env PYTHON_HOME={{ base_dir }}/venv
 env PATH=$PYTHON_HOME/bin:$PATH
 
 start on runlevel [2345]
 stop on runlevel [016]
 
-chdir /srv/{{ app_name }}
-exec $PYTHON_HOME/bin/envdir {{ env_dir }} $PYTHON_HOME/bin/python turnipserver.py
+chdir {{ base_dir }}/code
+exec $PYTHON_HOME/bin/envdir {{ base_dir }}/envs $PYTHON_HOME/bin/python turnipserver.py
 
 respawn