=== added directory 'charm'
=== added file 'charm/Makefile'
--- charm/Makefile	1970-01-01 00:00:00 +0000
+++ charm/Makefile	2017-01-16 18:19:02 +0000
@@ -0,0 +1,69 @@
+NAME ?= launchpad-importd
+RESOURCE_NAME ?= launchpad
+TOPDIR ?= $(CURDIR)/..
+BUILDDIR ?= $(CURDIR)/dist
+TMPDIR ?= $(CURDIR)/tmp
+
+CHARM_SERIES ?= xenial
+CHARM_SRC ?= $(CURDIR)
+JUJU_REPOSITORY = $(BUILDDIR)
+CHARMDIR = $(BUILDDIR)/$(CHARM_SERIES)/$(NAME)
+CHARMREPODIR = $(BUILDDIR)/build
+RESOURCES = $(BUILDDIR)/resources/$(RESOURCE_NAME)
+CHARM = $(CHARMDIR)/.done
+LAYER_PATH = $(TMPDIR)/layer
+INTERFACE_PATH = $(TMPDIR)/interface
+CHARM_WHEELDIR = $(TMPDIR)/wheels
+CHARM_DEPS = $(LAYER_PATH)/.done $(INTERFACE_PATH)/.done
+EXTRA_CHARM_BUILD_ARGS ?=
+DEPLOY_ENV ?= devel
+
+export INTERFACE_PATH
+export LAYER_PATH
+export JUJU_REPOSITORY
+
+
+build: $(CHARM)
+
+resources: $(RESOURCES)
+
+build-with-resources: build resources
+
+$(TMPDIR) $(BUILDDIR):
+	mkdir -p $@
+
+$(CHARM_DEPS): $(TMPDIR) $(CHARM_SRC)/charm-deps
+	cd $(TMPDIR) && codetree $(CHARM_SRC)/charm-deps
+	rsync -a --delete \
+		$(CHARM_SRC)/layer/layer-launchpad/ \
+		$(TMPDIR)/layer/layer-launchpad/
+	touch $(CHARM_DEPS)
+
+$(CHARM): $(CHARM_SRC) $(CHARM_SRC)/* $(CHARM_DEPS) | $(BUILDDIR)
+	rm -rf $(CHARMDIR)
+	PIP_NO_INDEX=true PIP_FIND_LINKS=$(CHARM_WHEELDIR) charm build -o $(BUILDDIR) -s $(CHARM_SERIES) -n $(NAME) $(EXTRA_CHARM_BUILD_ARGS)
+	touch $@
+
+clean:
+	rm -rf $(BUILDDIR) $(TMPDIR)
+
+$(RESOURCES): $(TMPDIR)
+	rm -rf $(TMPDIR)/$(RESOURCE_NAME)/ $(TMPDIR)/$(RESOURCE_NAME).tar.gz
+	rsync -a --delete --exclude /charm \
+		$(TOPDIR)/ $(TMPDIR)/$(RESOURCE_NAME)/
+	tar -C $(TMPDIR) -czf $(TMPDIR)/$(RESOURCE_NAME).tar.gz \
+		$(RESOURCE_NAME)/
+	mkdir -p $(RESOURCES)
+	mv $(TMPDIR)/$(RESOURCE_NAME).tar.gz \
+		$(RESOURCES)/$(RESOURCE_NAME).tar.gz
+
+deploy:
+	juju deploy $(CHARMDIR)
+
+deploy-with-resources:
+	juju deploy \
+		--resource=$(RESOURCE_NAME).tar.gz=$(RESOURCES)/$(RESOURCE_NAME).tar.gz \
+		$(CHARMDIR)
+
+.PHONY: build resources build-with-resources clean
+.PHONY: deploy deploy-with-resources

=== added file 'charm/charm-deps'
--- charm/charm-deps	1970-01-01 00:00:00 +0000
+++ charm/charm-deps	2017-01-16 16:51:45 +0000
@@ -0,0 +1,10 @@
+interface                           @
+interface/nrpe-external-master      lp:~ubuntuone-hackers/ols-charm-deps/interface-nrpe-external-master;revno=4
+
+layer                               @
+layer/layer-apt                     git+ssh://git.launchpad.net/layer-apt;revno=608bdf5
+layer/layer-basic                   lp:~ubuntuone-hackers/ols-charm-deps/layer-basic;revno=62
+# Copied by Makefile instead.
+#layer/layer-launchpad              layer/layer-launchpad
+
+wheels                              git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels

=== added file 'charm/config.yaml'
--- charm/config.yaml	1970-01-01 00:00:00 +0000
+++ charm/config.yaml	2017-01-12 15:28:57 +0000
@@ -0,0 +1,4 @@
+options:
+    install_sources:
+        # XXX something IS-maintained
+        default: ppa:launchpad/ppa

=== added directory 'charm/layer'
=== added file 'charm/layer.yaml'
--- charm/layer.yaml	1970-01-01 00:00:00 +0000
+++ charm/layer.yaml	2017-01-16 17:58:07 +0000
@@ -0,0 +1,12 @@
+repo: lp:launchpad
+includes:
+    - layer:basic
+    - layer:apt
+    - layer:launchpad
+options:
+    apt:
+        packages:
+            - launchpad-dependencies
+ignore:
+    - dist
+    - tmp

=== added directory 'charm/layer/layer-launchpad'
=== added file 'charm/layer/layer-launchpad/Makefile'
--- charm/layer/layer-launchpad/Makefile	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/Makefile	2017-01-13 17:50:39 +0000
@@ -0,0 +1,40 @@
+TEST_TIMEOUT := 900
+HOST_SERIES := $(shell lsb_release -sc)
+
+# /!\ Ensure that errors early in pipes cause failures, rather than
+# overridden by the last stage of the pipe. cf. 'test.py | ts'
+SHELL := /bin/bash
+export SHELLOPTS:=errexit:pipefail
+
+
+default:
+	@echo "One of:"
+	@echo "    make testdeps"
+	@echo "    make lint"
+
+
+_fail_ex:
+	false | ts
+
+_success_ex:
+	true | ts
+
+
+test: lint
+
+testdeps:
+ifeq ($(HOST_SERIES),trusty)
+	sudo apt-get install -y python-tox bzr moreutils \
+	    software-properties-common
+else
+	sudo apt-get install -y tox bzr moreutils \
+	    software-properties-common
+endif
+	sudo add-apt-repository -y ppa:juju/stable
+	sudo apt-get install charm-tools
+
+
+CHARM_NAME := layer-launchpad
+
+lint:
+	tox -e lint

=== added file 'charm/layer/layer-launchpad/config.yaml'
--- charm/layer/layer-launchpad/config.yaml	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/config.yaml	2016-11-29 11:15:20 +0000
@@ -0,0 +1,33 @@
+options:
+  install_sources:
+    # description and type comes from the apt layer.
+    default: ""
+  install_keys:
+    # description and type comes from the apt layer.
+    default: ""
+  nagios_context:
+    type: string
+    default: ""
+    description: |
+      Used by the nrpe subordinate charms.
+  nagios_servicegroups:
+      default: ""
+      type: string
+      description: |
+        A comma-separated list of nagios servicegroups.
+        If left empty, the nagios_context will be used as the servicegroup
+  environment:
+      type: string
+      default: production
+      description: production, staging, or devel
+  statsd_dsn: 
+      default: ""
+      type: string
+      description: |
+          statsd url, see http://talisker.readthedocs.io/en/latest/statsd.html for details 
+  sentry_dsn:
+    type: string
+    default: ""
+    description: |
+      DSN for configuration of Sentry's raven client.
+      See https://<sentry_host>/sentry/snapdeltaservice/settings/keys/

=== added directory 'charm/layer/layer-launchpad/files'
=== added file 'charm/layer/layer-launchpad/layer.yaml'
--- charm/layer/layer-launchpad/layer.yaml	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/layer.yaml	2017-01-13 17:53:07 +0000
@@ -0,0 +1,13 @@
+includes: 
+    - layer:basic
+    - layer:apt
+    - interface:nrpe-external-master
+options:
+    basic:
+        use_venv: true
+        include_system_packages: true
+        packages:
+            - python3-yaml
+    launchpad:
+        service_name: launchpad-service
+        user: launchpad

=== added directory 'charm/layer/layer-launchpad/lib'
=== added directory 'charm/layer/layer-launchpad/lib/charms'
=== added directory 'charm/layer/layer-launchpad/lib/charms/layer'
=== added file 'charm/layer/layer-launchpad/lib/charms/layer/launchpad.py'
--- charm/layer/layer-launchpad/lib/charms/layer/launchpad.py	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/lib/charms/layer/launchpad.py	2017-01-16 17:38:19 +0000
@@ -0,0 +1,125 @@
+import os
+import subprocess
+
+from charmhelpers.core import (
+    hookenv,
+    host,
+    unitdata,
+    )
+
+
+# Layer configs #
+
+def _layer_options():
+    # import here, bc not available during unittest
+    from charms import layer
+    return layer.options().get('launchpad', {})
+
+
+def service_name():
+    return _layer_options().get('service_name')
+
+
+def user():
+    return _layer_options().get('user', 'ubuntu')
+
+
+def lpconfig():
+    return _layer_options().get('lpconfig')
+
+
+# derived configs #
+
+
+def root_dir():
+    return '/srv'
+
+
+def base_dir():
+    basedir = "{}/{}".format(root_dir(), service_name())
+    return basedir
+
+
+def etc_dir():
+    return '{}/etc'.format(base_dir())
+
+
+def code_dir():
+    return '{}/code'.format(base_dir())
+
+
+def logs_dir():
+    return '{}/logs'.format(base_dir())
+
+
+def readonly_dirs():
+    return [os.path.dirname(base_dir()), base_dir(), etc_dir()]
+
+
+def writable_dirs():
+    return [logs_dir()]
+
+
+def service_config_path():
+    return '{}/{}'.format(etc_dir(), service_config_filename())
+
+
+def service_config_filename():
+    return _layer_options().get('config_filename', 'settings.py')
+
+
+def config_files():
+    files = []
+    files.append(service_config_path())
+    return files
+
+
+# Utilities #
+
+def ensure_directories(readonly, writable, user):
+    hookenv.log('Creating service user')
+    # ensure user and group
+    host.adduser(user, primary_group=user)
+    # ensure RO dirs
+    hookenv.log('Creating service directories')
+    for dirpath in readonly:
+        host.mkdir(dirpath, group=user, perms=0o754)
+    # ensure RW dirs
+    for dirpath in writable:
+        host.mkdir(dirpath, group=user, perms=0o774)
+
+
+def create_virtualenv(wheels_dir, codedir):
+    env_dir = os.path.join(codedir, 'env')
+    if os.path.exists(env_dir):
+        hookenv.log('Virtualenv already exists, not creating it.')
+    else:
+        hookenv.log('Installing python packages into the venv')
+        subprocess.check_call(['virtualenv', '-p', 'python3', env_dir])
+
+    requirements = os.path.join(codedir, 'requirements.txt')
+
+    hookenv.log('Installing from local wheelhouse.')
+    subprocess.check_call(['%s/bin/pip' % env_dir,
+                           'install',
+                           '--no-index',
+                           '--find-links={}'.format(wheels_dir),
+                           '-r', requirements])
+
+
+def render_template(template, context):
+    from jinja2 import Template
+    tmpl = Template(template, lstrip_blocks=True, trim_blocks=True)
+    return tmpl.render(**context)
+
+
+def check_port(key, new_port):
+    """Open/close a port and keep track of it based on key:"""
+    unitdata_key = '{}.port'.format(key)
+    kv = unitdata.kv()
+    existing_port = kv.get(unitdata_key)
+    if existing_port != new_port:
+        hookenv.open_port(new_port)
+        if existing_port:  # Dont try to close non existing ports
+            hookenv.close_port(existing_port)
+        kv.set(unitdata_key, new_port)

=== added file 'charm/layer/layer-launchpad/metadata.yaml'
--- charm/layer/layer-launchpad/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/metadata.yaml	2017-01-13 17:52:34 +0000
@@ -0,0 +1,12 @@
+name: launchpad
+summary: Launchpad
+maintainer: Colin Watson <cjwatson@canonical.com>
+description: |
+  A layer for charms that run Launchpad code.
+tags:
+  - application_development
+subordinate: false
+provides:
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container

=== added directory 'charm/layer/layer-launchpad/reactive'
=== added file 'charm/layer/layer-launchpad/reactive/launchpad.py'
--- charm/layer/layer-launchpad/reactive/launchpad.py	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/reactive/launchpad.py	2017-01-16 17:38:48 +0000
@@ -0,0 +1,83 @@
+import os.path
+import shutil
+import subprocess
+
+from charmhelpers.core import (
+    hookenv,
+    host,
+    )
+from charmhelpers.payload import archive
+from charms.apt import status_set
+from charms.reactive import (
+    hook,
+    remove_state,
+    set_state,
+    when,
+    when_not,
+    )
+
+from charms.layer.launchpad import (
+    code_dir,
+    ensure_directories,
+    lpconfig,
+    readonly_dirs,
+    user,
+    writable_dirs,
+    )
+
+# states #
+
+
+@when_not('launchpad.service.installed', 'apt.queued_installs')
+def install_service():
+    writable = writable_dirs()
+    readonly = readonly_dirs()
+    ensure_directories(readonly, writable, user())
+
+    payload = 'launchpad.tar.gz'
+    dest = code_dir()
+    cache_dir = os.path.join(hookenv.charm_dir(), 'cache')
+    host.mkdir(cache_dir, perms=0o755)
+    local_path = os.path.join(cache_dir, payload)
+    resource_path = hookenv.resource_get(payload)
+    if resource_path and os.path.getsize(resource_path):
+        changed = host.file_hash(local_path) != host.file_hash(resource_path)
+        if not changed:
+            return
+    else:
+        status_set('blocked', 'Resource {} missing'.format(payload))
+        return
+    hookenv.log('Extracting resource to {}'.format(dest))
+    archive.extract_tarfile(resource_path, dest)
+    host.chownr(dest, 'root', 'root', chowntopdir=True)
+    subprocess.check_call(['make', '-C', dest, 'LPCONFIG=%s' % lpconfig()])
+    shutil.copy2(resource_path, local_path)
+    hookenv.status_set('waiting', 'Service installed but not configured')
+    set_state('launchpad.service.installed')
+
+
+@hook('upgrade-charm')
+def upgrade_charm():
+    # XXX: remove, only for development.
+    remove_state('launchpad.service.installed')
+    remove_state('launchpad.configured')
+    remove_state('service.configured')
+
+
+@when('config.changed')
+def handle_config_changes():
+    remove_state('launchpad.configured')
+    remove_state('service.configured')
+
+
+@when('service.configured')
+@when_not('launchpad.configured')
+def reconfigure():
+    remove_state('service.configured')
+
+
+@when('launchpad.service.installed')
+@when_not('apt.queued_installs', 'launchpad.configured')
+def ols_configured():
+    set_state('launchpad.configured')
+    hookenv.status_set('waiting', 'Launchpad layer configured')

=== added file 'charm/layer/layer-launchpad/tox.ini'
--- charm/layer/layer-launchpad/tox.ini	1970-01-01 00:00:00 +0000
+++ charm/layer/layer-launchpad/tox.ini	2017-01-16 16:39:34 +0000
@@ -0,0 +1,19 @@
+[tox]
+skipsdist = True
+envlist=lint
+
+[flake8]
+ignore=
+    # closing bracket does not match indentation of opening bracket’s line
+    # Launchpad style differs on this
+    E123
+#max-complexity=10
+
+[testenv:lint]
+basepython=python3
+sitepackages=False
+whitelist_externals=charm
+deps=flake8
+commands=
+    flake8 {posargs:reactive lib}
+#charm proof

=== added file 'charm/metadata.yaml'
--- charm/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charm/metadata.yaml	2017-01-16 18:05:40 +0000
@@ -0,0 +1,16 @@
+name: launchpad-importd
+summary: Launchpad code import daemon
+description: |
+    A Launchpad code import daemon.
+tags:
+    - application_development
+maintainer: Colin Watson <cjwatson@canonical.com>
+subordinate: false
+series:
+    - xenial
+resources:
+    launchpad.tar.gz:
+        type: file
+        filename: launchpad.tar.gz
+        description: The Launchpad source code.
+min-juju-version: 2.0.0