Merge lp:~ibmcharmers/charms/trusty/ibm-mq/trunk into lp:charms/trusty/ibm-mq

[Anita Nayak]

Hi Matt,

I have updated ibm-mq charm as per below:

1. updated /etc/pam.d/common-session file to reflect the config changes for soft and hard nofile limits.
2. Updated the README.md appropriately.

[lp:~ibmcharmers/charms/trusty/ibm-mq/trunk]

53. By Anita Nayak on 2017-02-15

checkin after review comment incorporation to interface interface-ibm-mq

Unmerged revisions

53. By Anita Nayak on 2017-02-15

checkin after review comment incorporation to interface interface-ibm-mq

52. By Anita Nayak on 2016-10-04

Check in for trusty version of ibm-mq

51. By Anita Nayak on 2016-09-26

check-in with proper file permission

50. By Anita Nayak on 2016-09-26

Check-in for ibm-mq layered for trusty

49. By krishna bandi on 2016-06-21

updated ibm-mq charm

48. By krishna bandi on 2016-05-30

Updated Amulet test files

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2017-02-15 08:51:47 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/make
+
+all: lint unit_test
+
+
+.PHONY: clean
+clean:
+	@rm -rf .tox
+
+.PHONY: apt_prereqs
+apt_prereqs:
+	@# Need tox, but don't install the apt version unless we have to (don't want to conflict with pip)
+	@which tox >/dev/null || (sudo apt-get install -y python-pip && sudo pip install tox)
+
+.PHONY: lint
+lint: apt_prereqs
+	@tox --notest
+	@PATH=.tox/py34/bin:.tox/py35/bin flake8 $(wildcard hooks reactive lib unit_tests tests)
+	@charm proof
+
+.PHONY: unit_test
+unit_test: apt_prereqs
+	@echo Starting tests...
+	tox
 
=== modified file 'README.md'
--- README.md	2015-07-09 18:38:01 +0000
+++ README.md	2017-02-15 08:51:47 +0000
@@ -1,157 +1,144 @@
-
-Charm for IBM MQ
-
-Overview
---------
+## Charm for IBM MQ
+
+### Overview
 
 IBM MQ
 
-IBM MQ provides for messaging services to transport multiple types of data.
-MQ Runtime, Server and Sample components from IBM MQ product
-can be deployed using this charm.
+IBM MQ provides messaging services to transport multiple types of data.
+MQ Runtime, Server and Sample components from IBM MQ product can be deployed using this charm.
 
 
 This charm installs IBM MQ product and configures it's IP Address and default
 port number (1414). MQ Administrators can setup queue managers
 and queues. This will allow IBM MQ client application to transmit/receive messages.
 
-More information on IBM MQ  available at the [Product Page][product-page]
-and [IBM Knowledge Center][mq-v8-info]
-
-Usage
------
-
-Download (see below) your licensed IBM MQ 8.0.0.2 software and copy it to the
-`files/archives` directory of MQ charm.
-
-For e.g:
-
-  * Go to the `files/archives` directory.
-
-  * Copy the `WS_MQ_8.0.0.2_FOR_LIN_ON_LE_POWER.tar.gz` file to this directory for
-    `POWER LE` base machines.  For `x86_64`, use `WS_MQ_V8.0.0.2_LINUX_ON_X86_64_I.tar.gz`.
-
-  * The file name you have could be different from the example above (but with the
-    `.gz` extension). Ensure a backup copy of the file.
-
-To install the downloaded binaries you must agree to the IBM license.  The license
-file(s) can be found under the `files/archives/licenses` directory on extraction
-of IBM MQ software using the following command:
-
-    tar xvfz *.gz  --strip-components=1
-
-The license can also be viewed by running the following command after extracting
-IBM MQ to the files/archives directory:
-
-    ./mqlicense.sh -text_only
-
-Run the following to deploy this charm:
-
+More information on IBM MQ available at the [Product Page](http://www-03.ibm.com/software/products/en/ibm-mq) and [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSFKSJ_8.0.0/com.ibm.mq.helphome.v80.doc/WelcomePagev8r0.htm)
+
+### Usage
+
+Download your licensed IBM MQ software and host it in a way that can be downloaded using curl.
+curl-url and curl-opts are two main options we are using from ibm-base-layer to download the ibm product as IBM-MQ is built on top of the ibm-base layer [More Info](http://interfaces.juju.solutions/layer/ibm-base/)
+
+### Deploy
+
+Run the following commands to deploy this charm:
+           
     juju deploy ibm-mq
 
-At this point the charm will wait until the user accepts the license.  If you
-agree to the license, run the following command:
-
-    juju set ibm-mq accept-ibm-mq-license=True
+Here the charm will wait until the user accepts the license. If you agree to the license, run the following command.
+
+    juju set-config ibm-mq license_accepted="True"
+
+IBM MQ charm also needs an host from where the packages can be downloaded (the user has to keep the MQ packages on this host server), from the directory where the package is kept, user name and password to connect to the host server (as mentioned in the creating repositories section).
+
+We have to provide values for curl-url and curl-opt to download the product.
+curl-url with host name,package_dir, package name, checksum value, curl-opts with user name and password, to proceed with the installation. To provide these run the following command:
+
+    juju set-config ibm-mq curl_url="<hostname>/<package_dir><package_name>?<sha512=value>"
+    juju set-config ibm-mq curl_opts="-u <username>:<password>"
+
+
+For eg:
+    juju set-config ibm-mq curl_url="http://1.2.3.4/debs/MQ/WS_MQ_V8.0.0.2_LINUX_ON_X86_64_I.tar.gz?sha512=cd604a577ae51d93fc384241ce2faf21927b202d0a9e5f9b9a25caf4460fd6c34f32649caef8ecd543c244413788fe105987d16553e2d4754ef02d924843e95f"
+
+    juju set-config ibm-mq curl_opts="-u root:root123"
+
+Setting the license-accepted to False will uninstall the product:
+
+     juju set-config ibm-mq license_accepted="False"
+	  
+	  
+### Update the following system configuration manually:
 
 In order to create MQ objects like queue, it is required that some
-of the system configurations be updated. Details provided at
-[IBM Knowledge Center][mq-config-info].
-
-The Charm updates the following system configuration:
+	of the system configurations be updated. Details provided at
+	[IBM Knowledge Center][mq-config-info].
 
   * In `/etc/sysctl.conf`:
 
         fs.file-max = 524288
         kernel.shmmax = 268435456
 
-  * In `/etc/security/limits.conf`:
+### Relation with other services:
+
+ ibm-mq can have relation with other services to get the service specific queue manager. Per example if ibm-mq gets relation with ibm-was then, ibm-was specific queue manger will be created like 'ibm-wasQM'.
+ 
+    juju add-relation ibm-mq:messaging ibm-was-base:wasmessaging
+ or     
+ 
+    juju add-relation ibm-mq ibm-was-base
+	
+IBM-MQ sets Queue Manager name, Queue Name, IP Address and Port for the connected services.
+	It creates a Queue Manager for the consumer application and a local queue i.e QUEUE1 for above Queue Manager.
+	But as a Queue Name it sets a filename where MQSC Commands can be edited for further operation.
+      
+on removal of relation with the service with which already relation was established, the service specific queue manger will be removed i.e in the above case 'ibm-wasQM' will be removed.
+
+     juju remove-relation ibm-mq:messaging ibm-was-base:wasmessaging
+or  
+    
+     juju remove-relation ibm-mq ibm-was-base
+##### The Charm updates the following system configuration:
+
+In order to create MQ objects like queue, it is required that some
+of the system configurations be updated. Details provided at
+[IBM Knowledge Center][mq-config-info].
+
+  * Adds user `ubuntu` to group `mqm`.
+
+  * In `/etc/security/limits.conf` if hard nofile and soft nofile limit for user `mqm` are  less than 10240:
 
         mqm              hard    nofile          10240
         mqm              soft    nofile          10240
-
-  * Adds user `ubuntu` to group `mqm`.
+  
+  * Updates `/etc/pam.d/common-session` file to take the above configurations to take effect
 
 Verify these changes have been made successfully if MQ throws up any errors.
 
-Configuration
--------------
-
-`accept-ibm-mq-license`
-Before you can use or install IBM MQ,
-you must accept the terms of International License
-Agreement for Non-Warranted Programs and additional license information.
-Please read the license agreement carefully.
-
-The license file(s) can be found under the `files/archives` directory after
-downloading and extracting IBM MQ there. The license can also be viewed by
-running the following command after extracting IBM MQ to the `files/archives`
-directory:
-      ./mqlicense.sh -text_only
-
-Set the value of accept-ibm-mq-license to True if you agree to IBM MQ license.
-
-**The IBM MQ software cannot be installed until the terms and
-conditions are accepted.  The charm will not function correctly until the
-this configuration option is set to True.**
-
-Known Limitations
------------------
+
+#### Configuration
+
+**license_accepted** (boolean) Some IBM charms require acceptance of a license before installation can proceed. If required, setting this option to True indicates that you have read and accepted the IBM terms and conditions found in the license file referenced by the charm. 
+
+ **curl_url** 
+ 
+ For downloading package we need to set curl_url with following options.
+  - *hostname* - The web server host name from which IBM MQ installation packages can be downloaded.
+  - *package_dir* - The package directory path in the web server.
+  - *package name* - The IBM MQ Package name.
+  - *checksum value* - Checksum value to check integrity of IBM MQ package. The Charm
+    uses sha512sum to check the integrity. If empty, it does not carry out the
+    integrity check. Use `sha512sum <Package Location/Package Name>`
+    to find out Checksum value for downloaded package. 
+
+**curl_opts**
+
+   We need to set curl_opts with following options. - username - User name of the webserver/sftp host. - password - Password of the webserver/sftp host.
+
+##### Known Limitations:
 
 Local providers does not allow updates to system configuration using sysctl
 command. These configurations will need be done manually for MQ to function.
 The required configurations are provided in this document.
 
-IBM MQ Information
--------------------
-
-### (1) General Information
-
-Details about MQ available [here][mq-info].
-
-Details about MQ Version 8.0 available at [IBM Knowledge Center][mq-v8-info].
-
-### (2) Download Information
-
-Information on procuring MQ product is available at the [Product Page][product-page]
-and at the [Passport Advantage Site][passport].
-
-A development version for `x86_64` is available [here][dev-download].
-After clicking on the above link and if you agree to the license, click on
-'I agree' link to download the IBM MQ package.
-
-A 90 days trial version is available [here][trial-download].
-
-### (3) License Information
-
-License information for IBM MQ  is available as part of the downloaded product
-package. The license can be viewed by running the following command after
-extracting IBM MQ:
-
-    ./mqlicense.sh -text_only
-
-License for the development version is available
-[here][license].
-
-# Contact Information
-
-For issues with this charm, please contact <[e-mail]>
-
-
-<!-- Links -->
-
-[mq-v8-info]: http://www-01.ibm.com/support/knowledgecenter/SSFKSJ_8.0.0/com.ibm.mq.helphome.v80.doc/WelcomePagev8r0.htm "MQ Version 8.0"
-
-[product-page]: http://www-03.ibm.com/software/products/en/ibm-mq "MQ Product Page"
-
-[mq-config-info]: http://www-01.ibm.com/support/knowledgecenter/SSFKSJ_8.0.0/com.ibm.mq.ins.doc/q008550_.htm?lang=en
-
-[mq-info]: http://www-01.ibm.com/software/integration/wmq/library/ "MQ Info"
-
-[passport]: http://www-01.ibm.com/software/passportadvantage/ "Passport Advantage"
-
-[dev-download]: http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?popup=Y&li_formnum=L-APIG-9BUHAE&accepted_url=http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev80_linux_x86-64.tar.gz "x86_64 Dev Download"
-
-[trial-download]: http://www-03.ibm.com/software/products/en/ibm-mq "Trial Download"
-
-[license]: http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?popup=Y&li_formnum=L-APIG-9BUHAE&accepted_url=http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev80_linux_x86-64.tar.gz "License"
+### IBM MQ Information
+
+(1) General Information
+Details about MQ available [here](http://www-01.ibm.com/software/integration/wmq/library/).
+Details about MQ Version 8.0 available at [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSFKSJ_8.0.0/com.ibm.mq.helphome.v80.doc/WelcomePagev8r0.htm).
+
+(2) Download Information
+Information on procuring MQ product is available at the [Product Page](http://www-03.ibm.com/software/products/en/ibm-mq) and at the [Passport Advantage Site](http://www-01.ibm.com/software/passportadvantage/).
+
+A development version for x86_64 is available [here](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?popup=Y&li_formnum=L-APIG-9BUHAE&accepted_url=http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev80_linux_x86-64.tar.gz). After clicking on the above link and if you agree to the license, click on 'I agree' link to download the IBM MQ package.
+A 90 days trial version is available [here](http://www-03.ibm.com/software/products/en/ibm-mq).
+
+(3) License Information
+License information for IBM MQ is available as part of the downloaded product package. The license can be viewed by running the following command after extracting IBM MQ.
+
+./mqlicense.sh -text_only
+
+License for the development version is available [here](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?popup=Y&li_formnum=L-APIG-9BUHAE&accepted_url=http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev80_linux_x86-64.tar.gz).
+
+Contact Information
+For issues with this charm, please contact [e-mail]
 
=== added directory 'bin'
=== added file 'bin/layer_option'
--- bin/layer_option	1970-01-01 00:00:00 +0000
+++ bin/layer_option	2017-02-15 08:51:47 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append('lib')
+
+import argparse
+from charms.layer import options
+
+
+parser = argparse.ArgumentParser(description='Access layer options.')
+parser.add_argument('section',
+                    help='the section, or layer, the option is from')
+parser.add_argument('option',
+                    help='the option to access')
+
+args = parser.parse_args()
+value = options(args.section).get(args.option, '')
+if isinstance(value, bool):
+    sys.exit(0 if value else 1)
+elif isinstance(value, list):
+    for val in value:
+        print(val)
+else:
+    print(value)
 
=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,55 @@
+"options":
+  "extra_packages":
+    "description": "Space separated list of extra deb packages to install.\n"
+    "type": "string"
+    "default": ""
+  "package_status":
+    "default": "install"
+    "type": "string"
+    "description": "The status of service-affecting packages will be set to this value\
+      \ in the dpkg database. Valid values are \"install\" and \"hold\".\n"
+  "install_sources":
+    "description": "List of extra apt sources, per charm-helpers standard format (a\
+      \ yaml list of strings encoded as a string). Each source may be either a line\
+      \ that can be added directly to sources.list(5), or in the form ppa:<user>/<ppa-name>\
+      \ for adding Personal Package Archives, or a distribution component to enable.\n"
+    "type": "string"
+    "default": ""
+  "install_keys":
+    "description": "List of signing keys for install_sources package sources, per\
+      \ charmhelpers standard format (a yaml list of strings encoded as a string).\
+      \ The keys should be the full ASCII armoured GPG public keys. While GPG key\
+      \ ids are also supported and looked up on a keyserver, operators should be aware\
+      \ that this mechanism is insecure. null can be used if a standard package signing\
+      \ key is used that will already be installed on the machine, and for PPA sources\
+      \ where the package signing key is securely retrieved from Launchpad.\n"
+    "type": "string"
+    "default": ""
+  "curl_url":
+    "type": "string"
+    "default": ""
+    "description": |
+      Location of the IBM product installation file(s). This should be a URL
+      that curl can use to download files. Multiple URLs should be separated
+      by a space. NOTE: cryptographic verification is required and must be
+      specified as part of the URL query string with the key a valid hash
+      algorithms md5, sha256, or sha512, and the the checksum value itself
+      (http://<url>?[md5|sha256|sha512]=<checksum>).
+      For example:
+        'http://example.com/file.tgz?sha256=<sum>'
+        'sftp://example.com/file1.tgz?md5=<sum> ftp://example.com/file2.tgz?md5=<sum>'
+  "curl_opts":
+    "type": "string"
+    "default": ""
+    "description": |
+      The options passed to the 'curl' command when fetching files from
+      curl_url. For example:
+        '-u <user:password>'
+  "license_accepted":
+    "type": "boolean"
+    "default": !!bool "false"
+    "description": |
+      Some IBM charms require acceptance of a license before installation
+      can proceed. If required, setting this option to True indicates that you
+      have read and accepted the IBM terms and conditions found in the license
+      file referenced by the charm.
 
=== removed file 'config.yaml'
--- config.yaml	2015-05-03 16:45:29 +0000
+++ config.yaml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-options:
-  accept-ibm-mq-license:
-    type: boolean
-    default: False
-    description: |
-        The MQ software can only be used by
-        accepting the terms and conditions for IBM MQ License.
-        Setting this option to True 
-        indicates that you have read and accepted the IBM MQ terms and 
-        conditions found in the license file. The details about accessing
-        the license(s) can be found in the README.    
-        ** Do not set to False if a relation exists with this charm **
 
=== modified file 'copyright'
--- copyright	2015-03-11 19:52:30 +0000
+++ copyright	2017-02-15 08:51:47 +0000
@@ -1,4 +1,4 @@
-Copyright 2015 IBM Corporation
+Copyright 2016 IBM Corporation
 
 This Charm is licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 
=== added directory 'deps'
=== added directory 'deps/layer'
=== added directory 'deps/layer/layer-apt'
=== added file 'deps/layer/layer-apt/.gitignore'
--- deps/layer/layer-apt/.gitignore	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/.gitignore	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+*~
+*.pyc
 
=== added file 'deps/layer/layer-apt/README.md'
--- deps/layer/layer-apt/README.md	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/README.md	2017-02-15 08:51:47 +0000
@@ -0,0 +1,195 @@
+# Apt layer
+
+The Apt layer for Juju enables layered charms to more easily deal with
+deb packages and apt sources in a simple and efficient manner. It
+provides consistent configuration for operators, allowing them to
+easily specify custom apt sources and additional debs required for
+their particular installations.
+
+## Configuration
+
+The charm may provide defaults for these service configuration
+(config.yaml) options, and the operator may override them as required.
+
+* `extra_packages`
+
+  A space separated list of additional deb packages to install on
+  each unit.
+
+* `package_status`
+
+  'install' or 'hold'. When set to hold, packages installed using
+  the Apt layer API will be pinned, so that they will not be
+  automatically upgraded when package updates are performed. 'hold'
+  is particularly useful for allowing a service such as Landscape
+  to automatically apply security updates to most of the system,
+  whilst holding back any potentially service affecting updates.
+
+* `install_sources`
+
+  A list of apt sources containing the packages that need to be installed.
+  Each source may be either a line that can be added directly to
+  sources.list(5), or in the form ppa:<user>/<ppa-name> for adding
+  Personal Package Archives, or a distribution component to enable.
+  The list is a yaml list, encoded as a string. The nicest way of
+  declaring this in a yaml file looks like the following (in particular,
+  the | character indicates that the value is a multiline string):
+
+  ```yaml
+  install_sources: |
+      - ppa:stub/cassandra
+      - deb http://www.apache.org/dist/cassandra/debian 21x main
+  ```
+
+* `install_keys`
+
+  A list of GPG signing keys to accept. There needs to be one entry
+  per entry in install_sources. null may be used if no keep is
+  needed, which is the case for PPAs and for the standard Ubuntu
+  archives. Keys should be full ASCII armoured GPG public keys.
+  GPG key ids are also accepted, but in most environments this
+  mechanism is not secure. The install_keys list, like
+  install_sources, must also be a yaml formatted list encoded as
+  a string:
+
+  ```yaml
+  install_keys: |
+      - null
+      - |
+          -----BEGIN PGP PUBLIC KEY BLOCK-----
+          Version: GnuPG v1
+
+          mQINBFQJvgUBEAC0KcYCTj0hd15p4fiXBsbob0sKgsvN5Lm7N9jzJWlGshJ0peMi
+          kH8YhDXw5Lh+mPEHksL7t1L8CIr1a+ntns/Opt65ZPO38ENVkOqEVAn9Z5sIoZsb
+          AUeLlJzSeRLTKhcOugK7UcsQD2FHnMBJz50bxis9X7pjmnc/tWpjAGJfaWdjDIo=
+          =yiQ4
+          -----END PGP PUBLIC KEY BLOCK-----
+  ```
+
+## Usage
+
+Queue packages for installation, and have handlers waiting for
+these packages to finish being installed:
+
+```python
+import charms.apt
+
+@hook('install')
+def install():
+    charms.apt.queue_install(['git'])
+
+@when_not('apt.installed.gnupg')
+def install_gnupg():
+    charms.apt.queue_install(['gnupg'])
+
+@when('apt.installed.git')
+@when('apt.installed.gnupg')
+def grabit():
+    clone_repo()
+    validate_repo()
+```
+
+### API
+
+Several methods are exposed in the charms.apt Python package.
+
+* `add_source(source, key=None)`
+
+  Add an apt source.
+
+  A source may be either a line that can be added directly to
+  sources.list(5), or in the form ppa:<user>/<ppa-name> for adding
+  Personal Package Archives, or a distribution component to enable.
+
+  The package signing key should be an ASCII armoured GPG key. While
+  GPG key ids are also supported, the retrieval mechanism is insecure.
+  There is no need to specify the package signing key for PPAs or for
+  the main Ubuntu archives.
+
+  It is preferable if charms do not call this directly to hard
+  coded apt sources, but instead have these sources listed
+  as defaults in the install_sources config option. This allows
+  operators to mirror your packages to internal archives and
+  deploy your charm in environments without network access.
+
+  Sets the `apt.needs_update` reactive state.
+
+* `queue_install(packages, options=None)`
+
+  Queue one or more deb packages for install. The actual package
+  installation will be performed later by a handler in the
+  apt layer. The `apt.installed.{name}` state will be set once
+  the package installed (one state for each package).
+
+  If a package has already been installed it will not be reinstalled.
+
+  If a package has already been queued it will not be requeued, and
+  the install options will not be changed.
+
+* `installed()`
+
+  Returns the set of deb packages installed by this layer.
+
+* `purge(packages)`
+
+  Purge one or more deb packages from the system
+
+
+### Extras
+
+These methods are called automatically by the reactive framework as
+reactive state demands. However, you can also invoke them directly
+if you want the operation done right now.
+
+* `update()`
+
+  Update the apt cache. Removes the `apt.needs_update` state.
+
+
+* `install_queued()`
+
+  Installs deb packages queued for installation. On success, removes
+  the `apt.queued_installs` state, sets the `apt.installed.{packagename}`
+  state for each installed package, and returns True. On failure,
+  sets the unit workload status to blocked and returns False.
+  The package installs remain queued.
+
+
+### Layer Options
+
+Packages can be specified at charm-build time in `layer.yaml`. List the
+packages in the 'basic' or 'apt' sections.
+
+```yaml
+includes:
+  - layer:basic
+  - layer:apt
+options:
+  basic:
+    packages:
+      - python3-psycopg2
+  apt:
+    packages:
+      - git
+      - bzr
+```
+
+Packages required to import your Python reactive handlers should go
+under 'basic'. These get installed by the base layer very early during
+charm bootstrap, and only packages available in the main Ubuntu archive
+can go here. Other packages should go under 'apt'. These will be
+installed later, after custom apt sources such as PPAs have been added
+from the `install_sources` configuration option.
+
+
+## Support
+
+This layer is maintained on Launchpad by
+Stuart Bishop ([e-mail]).
+
+Code is available using git at git+ssh://git.launchpad.net/layer-apt.
+
+Bug reports can be made at https://bugs.launchpad.net/layer-apt.
+
+Queries and comments can be made on the Juju mailing list, Juju IRC
+channels, or at https://answers.launchpad.net/layer-apt.
 
=== added file 'deps/layer/layer-apt/config.yaml'
--- deps/layer/layer-apt/config.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/config.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,34 @@
+options:
+  extra_packages:
+    description: >
+        Space separated list of extra deb packages to install.
+    type: string
+    default: ""
+  package_status:
+    default: "install"
+    type: string
+    description: >
+        The status of service-affecting packages will be set to this
+        value in the dpkg database. Valid values are "install" and "hold".
+  install_sources:
+    description: >
+        List of extra apt sources, per charm-helpers standard
+        format (a yaml list of strings encoded as a string). Each source
+        may be either a line that can be added directly to
+        sources.list(5), or in the form ppa:<user>/<ppa-name> for adding
+        Personal Package Archives, or a distribution component to enable.
+    type: string
+    default: ""
+  install_keys:
+    description: >
+        List of signing keys for install_sources package sources, per
+        charmhelpers standard format (a yaml list of strings encoded as
+        a string). The keys should be the full ASCII armoured GPG public
+        keys. While GPG key ids are also supported and looked up on a
+        keyserver, operators should be aware that this mechanism is
+        insecure. null can be used if a standard package signing key is
+        used that will already be installed on the machine, and for PPA
+        sources where the package signing key is securely retrieved from
+        Launchpad.
+    type: string
+    default: ""
 
=== added file 'deps/layer/layer-apt/copyright'
--- deps/layer/layer-apt/copyright	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/copyright	2017-02-15 08:51:47 +0000
@@ -0,0 +1,15 @@
+Copyright 2015-2016 Canonical Ltd.
+
+This file is part of the Apt layer for Juju.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
=== added file 'deps/layer/layer-apt/layer.yaml'
--- deps/layer/layer-apt/layer.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/layer.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,5 @@
+defines:
+  packages:
+    type: array
+    default: []
+    description: Additional packages to be installed at time of bootstrap
 
=== added directory 'deps/layer/layer-apt/lib'
=== added directory 'deps/layer/layer-apt/lib/charms'
=== added file 'deps/layer/layer-apt/lib/charms/__init__.py'
--- deps/layer/layer-apt/lib/charms/__init__.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/lib/charms/__init__.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
 
=== added file 'deps/layer/layer-apt/lib/charms/apt.py'
--- deps/layer/layer-apt/lib/charms/apt.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/lib/charms/apt.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,182 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Apt layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+'''
+charms.reactive helpers for dealing with deb packages.
+
+Add apt package sources using add_source(). Queue deb packages for
+installation with install(). Configure and work with your software
+once the apt.installed.{packagename} state is set.
+'''
+import itertools
+import subprocess
+
+from charmhelpers import fetch
+from charmhelpers.core import hookenv, unitdata
+from charms import reactive
+
+
+__all__ = ['add_source', 'update', 'queue_install', 'install_queued',
+           'installed', 'purge', 'ensure_package_status']
+
+
+def add_source(source, key=None):
+    '''Add an apt source.
+
+    Sets the apt.needs_update state.
+
+    A source may be either a line that can be added directly to
+    sources.list(5), or in the form ppa:<user>/<ppa-name> for adding
+    Personal Package Archives, or a distribution component to enable.
+
+    The package signing key should be an ASCII armoured GPG key. While
+    GPG key ids are also supported, the retrieval mechanism is insecure.
+    There is no need to specify the package signing key for PPAs or for
+    the main Ubuntu archives.
+    '''
+    # Maybe we should remember which sources have been added already
+    # so we don't waste time re-adding them. Is this time significant?
+    fetch.add_source(source, key)
+    reactive.set_state('apt.needs_update')
+
+
+def queue_install(packages, options=None):
+    """Queue one or more deb packages for install.
+
+    The `apt.installed.{name}` state is set once the package is installed.
+
+    If a package has already been installed it will not be reinstalled.
+
+    If a package has already been queued it will not be requeued, and
+    the install options will not be changed.
+
+    Sets the apt.queued_installs state.
+    """
+    if isinstance(packages, str):
+        packages = [packages]
+    # Filter installed packages.
+    store = unitdata.kv()
+    queued_packages = store.getrange('apt.install_queue.', strip=True)
+    packages = {package: options for package in packages
+                if not (package in queued_packages or
+                        reactive.helpers.is_state('apt.installed.' + package))}
+    if packages:
+        unitdata.kv().update(packages, prefix='apt.install_queue.')
+        reactive.set_state('apt.queued_installs')
+
+
+def installed():
+    '''Return the set of deb packages completed install'''
+    return set(state.split('.', 2)[2] for state in reactive.bus.get_states()
+               if state.startswith('apt.installed.'))
+
+
+def purge(packages):
+    """Purge one or more deb packages from the system"""
+    fetch.apt_purge(packages, fatal=True)
+    store = unitdata.kv()
+    store.unsetrange(packages, prefix='apt.install_queue.')
+    for package in packages:
+        reactive.remove_state('apt.installed.{}'.format(package))
+
+
+def update():
+    """Update the apt cache.
+
+    Removes the apt.needs_update state.
+    """
+    status_set(None, 'Updating apt cache')
+    fetch.apt_update(fatal=True)  # Friends don't let friends set fatal=False
+    reactive.remove_state('apt.needs_update')
+
+
+def install_queued():
+    '''Installs queued deb packages.
+
+    Removes the apt.queued_installs state and sets the apt.installed state.
+
+    On failure, sets the unit's workload state to 'blocked' and returns
+    False. Package installs remain queued.
+
+    On success, sets the apt.installed.{packagename} state for each
+    installed package and returns True.
+    '''
+    store = unitdata.kv()
+    queue = sorted((options, package)
+                   for package, options in store.getrange('apt.install_queue.',
+                                                          strip=True).items())
+
+    installed = set()
+    for options, batch in itertools.groupby(queue, lambda x: x[0]):
+        packages = [b[1] for b in batch]
+        try:
+            status_set(None, 'Installing {}'.format(','.join(packages)))
+            fetch.apt_install(packages, options, fatal=True)
+            store.unsetrange(packages, prefix='apt.install_queue.')
+            installed.update(packages)
+        except subprocess.CalledProcessError:
+            status_set('blocked',
+                       'Unable to install packages {}'
+                       .format(','.join(packages)))
+            return False  # Without setting reactive state.
+
+    for package in installed:
+        reactive.set_state('apt.installed.{}'.format(package))
+
+    reactive.remove_state('apt.queued_installs')
+    return True
+
+
+def ensure_package_status():
+    '''Hold or unhold packages per the package_status configuration option.
+
+    All packages installed using this module and handlers are affected.
+
+    An mechanism may be added in the future to override this for a
+    subset of installed packages.
+    '''
+    packages = installed()
+    if not packages:
+        return
+    config = hookenv.config()
+    package_status = config['package_status']
+    changed = reactive.helpers.data_changed('apt.package_status',
+                                            (package_status, sorted(packages)))
+    if changed:
+        if package_status == 'hold':
+            hookenv.log('Holding packages {}'.format(','.join(packages)))
+            fetch.apt_hold(packages)
+        else:
+            hookenv.log('Unholding packages {}'.format(','.join(packages)))
+            fetch.apt_unhold(packages)
+    reactive.remove_state('apt.needs_hold')
+
+
+def status_set(state, message):
+    """Set the unit's workload status.
+
+    Set state == None to keep the same state and just change the message.
+    """
+    if state is None:
+        state = hookenv.status_get()[0]
+        if state == 'unknown':
+            state = 'maintenance'  # Guess
+    if state in ('error', 'blocked'):
+        lvl = hookenv.WARNING
+    else:
+        lvl = hookenv.INFO
+    hookenv.status_set(state, message)
+    hookenv.log('{}: {}'.format(state, message), lvl)
 
=== added directory 'deps/layer/layer-apt/reactive'
=== added file 'deps/layer/layer-apt/reactive/apt.py'
--- deps/layer/layer-apt/reactive/apt.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-apt/reactive/apt.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,131 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Apt layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+'''
+charms.reactive helpers for dealing with deb packages.
+
+Add apt package sources using add_source(). Queue deb packages for
+installation with install(). Configure and work with your software
+once the apt.installed.{packagename} state is set.
+'''
+import subprocess
+
+from charmhelpers import fetch
+from charmhelpers.core import hookenv
+from charmhelpers.core.hookenv import WARNING
+from charms import layer
+from charms import reactive
+from charms.reactive import when, when_not
+
+import charms.apt
+
+
+@when('apt.needs_update')
+def update():
+    charms.apt.update()
+
+
+@when('apt.queued_installs')
+@when_not('apt.needs_update')
+def install_queued():
+    charms.apt.install_queued()
+
+
+@when_not('apt.queued_installs')
+def ensure_package_status():
+    charms.apt.ensure_package_status()
+
+
+def filter_installed_packages(packages):
+    # Don't use fetch.filter_installed_packages, as it depends on python-apt
+    # and not available if the basic layer's use_site_packages option is off
+    # TODO: Move this to charm-helpers.fetch
+    cmd = ['dpkg-query', '--show', r'--showformat=${Package}\n']
+    installed = set(subprocess.check_output(cmd,
+                                            universal_newlines=True).split())
+    return set(packages) - installed
+
+
+def clear_removed_package_states():
+    """On hook startup, clear install states for removed packages."""
+    removed = filter_installed_packages(charms.apt.installed())
+    if removed:
+        hookenv.log('{} missing packages ({})'.format(len(removed),
+                                                      ','.join(removed)),
+                    WARNING)
+        for package in removed:
+            reactive.remove_state('apt.installed.{}'.format(package))
+
+
+def configure_sources():
+    """Add user specified package sources from the service configuration.
+
+    See charmhelpers.fetch.configure_sources for details.
+    """
+    config = hookenv.config()
+
+    # We don't have enums, so we need to validate this ourselves.
+    package_status = config.get('package_status')
+    if package_status not in ('hold', 'install'):
+        charms.apt.status_set('blocked',
+                              'Unknown package_status {}'
+                              ''.format(package_status))
+        # Die before further hooks are run. This isn't very nice, but
+        # there is no other way to inform the operator that they have
+        # invalid configuration.
+        raise SystemExit(0)
+
+    sources = config.get('install_sources')
+    keys = config.get('install_keys')
+    if reactive.helpers.data_changed('apt.configure_sources', (sources, keys)):
+        fetch.configure_sources(update=False,
+                                sources_var='install_sources',
+                                keys_var='install_keys')
+        reactive.set_state('apt.needs_update')
+
+    extra_packages = sorted(config.get('extra_packages', '').split())
+    if extra_packages:
+        charms.apt.queue_install(extra_packages)
+
+
+def queue_layer_packages():
+    """Add packages listed in build-time layer options."""
+    # Both basic and apt layer. basic layer will have already installed
+    # its defined packages, but rescheduling it here gets the apt layer
+    # state set and they will pinned as any other apt layer installed
+    # package.
+    opts = layer.options()
+    for section in ['basic', 'apt']:
+        if section in opts and 'packages' in opts[section]:
+            charms.apt.queue_install(opts[section]['packages'])
+
+
+# Per https://github.com/juju-solutions/charms.reactive/issues/33,
+# this module may be imported multiple times so ensure the
+# initialization hook is only registered once. I have to piggy back
+# onto the namespace of a module imported before reactive discovery
+# to do this.
+if not hasattr(reactive, '_apt_registered'):
+    # We need to register this to run every hook, not just during install
+    # and config-changed, to protect against race conditions. If we don't
+    # do this, then the config in the hook environment may show updates
+    # to running hooks well before the config-changed hook has been invoked
+    # and the intialization provided an opertunity to be run.
+    hookenv.atstart(hookenv.log, 'Initializing Apt Layer')
+    hookenv.atstart(clear_removed_package_states)
+    hookenv.atstart(configure_sources)
+    hookenv.atstart(queue_layer_packages)
+    reactive._apt_registered = True
 
=== added directory 'deps/layer/layer-basic'
=== added file 'deps/layer/layer-basic/.gitignore'
--- deps/layer/layer-basic/.gitignore	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/.gitignore	2017-02-15 08:51:47 +0000
@@ -0,0 +1,5 @@
+*.pyc
+*~
+.ropeproject
+.settings
+.tox
 
=== added file 'deps/layer/layer-basic/Makefile'
--- deps/layer/layer-basic/Makefile	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/Makefile	2017-02-15 08:51:47 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/make
+
+all: lint unit_test
+
+
+.PHONY: clean
+clean:
+	@rm -rf .tox
+
+.PHONY: apt_prereqs
+apt_prereqs:
+	@# Need tox, but don't install the apt version unless we have to (don't want to conflict with pip)
+	@which tox >/dev/null || (sudo apt-get install -y python-pip && sudo pip install tox)
+
+.PHONY: lint
+lint: apt_prereqs
+	@tox --notest
+	@PATH=.tox/py34/bin:.tox/py35/bin flake8 $(wildcard hooks reactive lib unit_tests tests)
+	@charm proof
+
+.PHONY: unit_test
+unit_test: apt_prereqs
+	@echo Starting tests...
+	tox
 
=== added file 'deps/layer/layer-basic/README.md'
--- deps/layer/layer-basic/README.md	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/README.md	2017-02-15 08:51:47 +0000
@@ -0,0 +1,221 @@
+# Overview
+
+This is the base layer for all charms [built using layers][building].  It
+provides all of the standard Juju hooks and runs the
+[charms.reactive.main][charms.reactive] loop for them.  It also bootstraps the
+[charm-helpers][] and [charms.reactive][] libraries and all of their
+dependencies for use by the charm.
+
+# Usage
+
+To create a charm layer using this base layer, you need only include it in
+a `layer.yaml` file:
+
+```yaml
+includes: ['layer:basic']
+```
+
+This will fetch this layer from [interfaces.juju.solutions][] and incorporate
+it into your charm layer.  You can then add handlers under the `reactive/`
+directory.  Note that **any** file under `reactive/` will be expected to
+contain handlers, whether as Python decorated functions or [executables][non-python]
+using the [external handler protocol][].
+
+### Charm Dependencies
+
+Each layer can include a `wheelhouse.txt` file with Python requirement lines.
+For example, this layer's `wheelhouse.txt` includes:
+
+```
+pip>=7.0.0,<8.0.0
+charmhelpers>=0.4.0,<1.0.0
+charms.reactive>=0.1.0,<2.0.0
+```
+
+All of these dependencies from each layer will be fetched (and updated) at build
+time and will be automatically installed by this base layer before any reactive
+handlers are run.
+
+Note that the `wheelhouse.txt` file is intended for **charm** dependencies only.
+That is, for libraries that the charm code itself needs to do its job of deploying
+and configuring the payload.  If the payload itself has Python dependencies, those
+should be handled separately, by the charm.
+
+See [PyPI][pypi charms.X] for packages under the `charms.` namespace which might
+be useful for your charm.
+
+### Layer Namespace
+
+Each layer has a reserved section in the `charms.layer.` Python package namespace,
+which it can populate by including a `lib/charms/layer/<layer-name>.py` file or
+by placing files under `lib/charms/layer/<layer-name>/`.  (If the layer name
+includes hyphens, replace them with underscores.)  These can be helpers that the
+layer uses internally, or it can expose classes or functions to be used by other
+layers to interact with that layer.
+
+For example, a layer named `foo` could include a `lib/charms/layer/foo.py` file
+with some helper functions that other layers could access using:
+
+```python
+from charms.layer.foo import my_helper
+```
+
+### Layer Options
+
+Any layer can define options in its `layer.yaml`.  Those options can then be set
+by other layers to change the behavior of your layer.  The options are defined
+using [jsonschema][], which is the same way that [action paramters][] are defined.
+
+For example, the `foo` layer could include the following option definitons:
+
+```yaml
+includes: ['layer:basic']
+defines:  # define some options for this layer (the layer "foo")
+  enable-bar:  # define an "enable-bar" option for this layer
+    description: If true, enable support for "bar".
+    type: boolean
+    default: false
+```
+
+A layer using `foo` could then set it:
+
+```yaml
+includes: ['layer:foo']
+options:
+  foo:  # setting options for the "foo" layer
+    enable-bar: true  # set the "enable-bar" option to true
+```
+
+The `foo` layer can then use the `charms.layer.options` helper to load the values
+for the options that it defined.  For example:
+
+```python
+from charms import layer
+
+@when('state')
+def do_thing():
+  layer_opts = layer.options('foo')  # load all of the options for the "foo" layer
+  if layer_opts['enable-bar']:  # check the value of the "enable-bar" option
+      hookenv.log("Bar is enabled")
+```
+
+You can also access layer options in other handlers, such as Bash, using
+the command-line interface:
+
+```bash
+. charms.reactive.sh
+
+@when 'state'
+function do_thing() {
+    if layer_option foo enable-bar; then
+        juju-log "Bar is enabled"
+        juju-log "bar-value is: $(layer_option foo bar-value)"
+    fi
+}
+
+reactive_handler_main
+```
+
+Note that options of type `boolean` will set the exit code, while other types
+will be printed out.
+
+# Hooks
+
+This layer provides hooks that other layers can react to using the decorators
+of the [charms.reactive][] library:
+
+  * `config-changed`
+  * `install`
+  * `leader-elected`
+  * `leader-settings-changed`
+  * `start`
+  * `stop`
+  * `upgrade-charm`
+  * `update-status`
+
+Other hooks are not implemented at this time. A new layer can implement storage
+or relation hooks in their own layer by putting them in the `hooks` directory.
+
+**Note:** Because `update-status` is invoked every 5 minutes, you should take
+care to ensure that your reactive handlers only invoke expensive operations
+when absolutely necessary.  It is recommended that you use helpers like
+[`@only_once`][], [`@when_file_changed`][], and [`data_changed`][] to ensure
+that handlers run only when necessary.
+
+# Layer Configuration
+
+This layer supports the following options, which can be set in `layer.yaml`:
+
+  * **packages**  A list of system packages to be installed before the reactive
+    handlers are invoked.
+
+  * **use_venv**  If set to true, the charm dependencies from the various
+    layers' `wheelhouse.txt` files will be installed in a Python virtualenv
+    located at `$CHARM_DIR/../.venv`.  This keeps charm dependencies from
+    conflicting with payload dependencies, but you must take care to preserve
+    the environment and interpreter if using `execl` or `subprocess`.
+
+  * **include_system_packages**  If set to true and using a venv, include
+    the `--system-site-packages` options to make system Python libraries
+    visible within the venv.
+
+An example `layer.yaml` using these options might be:
+
+```yaml
+includes: ['layer:basic']
+options:
+  basic:
+    packages: ['git']
+    use_venv: true
+    include_system_packages: true
+```
+
+
+# Reactive States
+
+This layer will set the following states:
+
+  * **`config.changed`**  Any config option has changed from its previous value.
+    This state is cleared automatically at the end of each hook invocation.
+
+  * **`config.changed.<option>`** A specific config option has changed.
+    **`<option>`** will be replaced by the config option name from `config.yaml`.
+    This state is cleared automatically at the end of each hook invocation.
+
+  * **`config.set.<option>`** A specific config option has a True or non-empty
+    value set.  **`<option>`** will be replaced by the config option name from
+    `config.yaml`.  This state is cleared automatically at the end of each hook
+    invocation.
+
+  * **`config.default.<option>`** A specific config option is set to its
+    default value.  **`<option>`** will be replaced by the config option name
+    from `config.yaml`.  This state is cleared automatically at the end of
+    each hook invocation.
+
+An example using the config states would be:
+
+```python
+@when('config.changed.my-opt')
+def my_opt_changed():
+    update_config()
+    restart_service()
+```
+
+
+# Actions
+
+This layer currently does not define any actions.
+
+
+[building]: https://jujucharms.com/docs/devel/authors-charm-building
+[charm-helpers]: https://pythonhosted.org/charmhelpers/
+[charms.reactive]: https://pythonhosted.org/charms.reactive/
+[interfaces.juju.solutions]: http://interfaces.juju.solutions/
+[non-python]: https://pythonhosted.org/charms.reactive/#non-python-reactive-handlers
+[external handler protocol]: https://pythonhosted.org/charms.reactive/charms.reactive.bus.html#charms.reactive.bus.ExternalHandler
+[jsonschema]: http://json-schema.org/
+[action paramters]: https://jujucharms.com/docs/stable/authors-charm-actions
+[pypi charms.X]: https://pypi.python.org/pypi?%3Aaction=search&term=charms.&submit=search
+[`@only_once`]: https://pythonhosted.org/charms.reactive/charms.reactive.decorators.html#charms.reactive.decorators.only_once
+[`@when_file_changed`]: https://pythonhosted.org/charms.reactive/charms.reactive.decorators.html#charms.reactive.decorators.when_file_changed
+[`data_changed`]: https://pythonhosted.org/charms.reactive/charms.reactive.helpers.html#charms.reactive.helpers.data_changed
 
=== added directory 'deps/layer/layer-basic/bin'
=== added file 'deps/layer/layer-basic/bin/layer_option'
--- deps/layer/layer-basic/bin/layer_option	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/bin/layer_option	2017-02-15 08:51:47 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append('lib')
+
+import argparse
+from charms.layer import options
+
+
+parser = argparse.ArgumentParser(description='Access layer options.')
+parser.add_argument('section',
+                    help='the section, or layer, the option is from')
+parser.add_argument('option',
+                    help='the option to access')
+
+args = parser.parse_args()
+value = options(args.section).get(args.option, '')
+if isinstance(value, bool):
+    sys.exit(0 if value else 1)
+elif isinstance(value, list):
+    for val in value:
+        print(val)
+else:
+    print(value)
 
=== added file 'deps/layer/layer-basic/copyright'
--- deps/layer/layer-basic/copyright	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/copyright	2017-02-15 08:51:47 +0000
@@ -0,0 +1,9 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+
+Files: *
+Copyright: 2015, Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ On Debian GNU/Linux system you can find the complete text of the
+ GPL-3 license in '/usr/share/common-licenses/GPL-3'
 
=== added directory 'deps/layer/layer-basic/hooks'
=== added file 'deps/layer/layer-basic/hooks/config-changed'
--- deps/layer/layer-basic/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/config-changed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/hook.template'
--- deps/layer/layer-basic/hooks/hook.template	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/hook.template	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/install'
--- deps/layer/layer-basic/hooks/install	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/install	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/leader-elected'
--- deps/layer/layer-basic/hooks/leader-elected	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/leader-elected	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/leader-settings-changed'
--- deps/layer/layer-basic/hooks/leader-settings-changed	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/leader-settings-changed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/start'
--- deps/layer/layer-basic/hooks/start	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/start	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/stop'
--- deps/layer/layer-basic/hooks/stop	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/stop	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/update-status'
--- deps/layer/layer-basic/hooks/update-status	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/update-status	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/hooks/upgrade-charm'
--- deps/layer/layer-basic/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/hooks/upgrade-charm	2017-02-15 08:51:47 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import os
+import sys
+sys.path.append('lib')
+
+# This is an upgrade-charm context, make sure we install latest deps
+if not os.path.exists('wheelhouse/.upgrade'):
+    open('wheelhouse/.upgrade', 'w').close()
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        os.unlink('wheelhouse/.bootstrapped')
+else:
+    os.unlink('wheelhouse/.upgrade')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'deps/layer/layer-basic/layer.yaml'
--- deps/layer/layer-basic/layer.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/layer.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,18 @@
+defines:
+  packages:
+    type: array
+    default: []
+    description: Additional packages to be installed at time of bootstrap
+  use_venv:
+    type: boolean
+    default: false
+    description: >
+      Install charm dependencies (wheelhouse) into a Python virtual environment
+      to help avoid conflicts with other charms or libraries on the machine.
+  include_system_packages:
+    type: boolean
+    default: false
+    description: >
+      If using a virtual environment, allow the venv to see Python packages
+      installed at the system level.  This reduces isolation, but is necessary
+      to use Python packages installed via apt-get.
 
=== added directory 'deps/layer/layer-basic/lib'
=== added directory 'deps/layer/layer-basic/lib/charms'
=== added directory 'deps/layer/layer-basic/lib/charms/layer'
=== added file 'deps/layer/layer-basic/lib/charms/layer/__init__.py'
--- deps/layer/layer-basic/lib/charms/layer/__init__.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/lib/charms/layer/__init__.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,21 @@
+import os
+
+
+class LayerOptions(dict):
+    def __init__(self, layer_file, section=None):
+        import yaml  # defer, might not be available until bootstrap
+        with open(layer_file) as f:
+            layer = yaml.safe_load(f.read())
+        opts = layer.get('options', {})
+        if section and section in opts:
+            super(LayerOptions, self).__init__(opts.get(section))
+        else:
+            super(LayerOptions, self).__init__(opts)
+
+
+def options(section=None, layer_file=None):
+    if not layer_file:
+        base_dir = os.environ.get('CHARM_DIR', os.getcwd())
+        layer_file = os.path.join(base_dir, 'layer.yaml')
+
+    return LayerOptions(layer_file, section)
 
=== added file 'deps/layer/layer-basic/lib/charms/layer/basic.py'
--- deps/layer/layer-basic/lib/charms/layer/basic.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/lib/charms/layer/basic.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,159 @@
+import os
+import sys
+import shutil
+import platform
+from glob import glob
+from subprocess import check_call
+
+from charms.layer.execd import execd_preinstall
+
+
+def bootstrap_charm_deps():
+    """
+    Set up the base charm dependencies so that the reactive system can run.
+    """
+    # execd must happen first, before any attempt to install packages or
+    # access the network, because sites use this hook to do bespoke
+    # configuration and install secrets so the rest of this bootstrap
+    # and the charm itself can actually succeed. This call does nothing
+    # unless the operator has created and populated $CHARM_DIR/exec.d.
+    execd_preinstall()
+    # ensure that $CHARM_DIR/bin is on the path, for helper scripts
+    os.environ['PATH'] += ':%s' % os.path.join(os.environ['CHARM_DIR'], 'bin')
+    venv = os.path.abspath('../.venv')
+    vbin = os.path.join(venv, 'bin')
+    vpip = os.path.join(vbin, 'pip')
+    vpy = os.path.join(vbin, 'python')
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        from charms import layer
+        cfg = layer.options('basic')
+        if cfg.get('use_venv') and '.venv' not in sys.executable:
+            # activate the venv
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            reload_interpreter(vpy)
+        return
+    # bootstrap wheelhouse
+    if os.path.exists('wheelhouse'):
+        with open('/root/.pydistutils.cfg', 'w') as fp:
+            # make sure that easy_install also only uses the wheelhouse
+            # (see https://github.com/pypa/pip/issues/410)
+            charm_dir = os.environ['CHARM_DIR']
+            fp.writelines([
+                "[easy_install]\n",
+                "allow_hosts = ''\n",
+                "find_links = file://{}/wheelhouse/\n".format(charm_dir),
+            ])
+        apt_install(['python3-pip', 'python3-setuptools', 'python3-yaml'])
+        from charms import layer
+        cfg = layer.options('basic')
+        # include packages defined in layer.yaml
+        apt_install(cfg.get('packages', []))
+        # if we're using a venv, set it up
+        if cfg.get('use_venv'):
+            if not os.path.exists(venv):
+                distname, version, series = platform.linux_distribution()
+                if series in ('precise', 'trusty'):
+                    apt_install(['python-virtualenv'])
+                else:
+                    apt_install(['virtualenv'])
+                cmd = ['virtualenv', '-ppython3', '--never-download', venv]
+                if cfg.get('include_system_packages'):
+                    cmd.append('--system-site-packages')
+                check_call(cmd)
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            pip = vpip
+        else:
+            pip = 'pip3'
+            # save a copy of system pip to prevent `pip3 install -U pip`
+            # from changing it
+            if os.path.exists('/usr/bin/pip'):
+                shutil.copy2('/usr/bin/pip', '/usr/bin/pip.save')
+        # need newer pip, to fix spurious Double Requirement error:
+        # https://github.com/pypa/pip/issues/56
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse',
+                    'pip'])
+        # install the rest of the wheelhouse deps
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse'] +
+                   glob('wheelhouse/*'))
+        if not cfg.get('use_venv'):
+            # restore system pip to prevent `pip3 install -U pip`
+            # from changing it
+            if os.path.exists('/usr/bin/pip.save'):
+                shutil.copy2('/usr/bin/pip.save', '/usr/bin/pip')
+                os.remove('/usr/bin/pip.save')
+        os.remove('/root/.pydistutils.cfg')
+        # flag us as having already bootstrapped so we don't do it again
+        open('wheelhouse/.bootstrapped', 'w').close()
+        # Ensure that the newly bootstrapped libs are available.
+        # Note: this only seems to be an issue with namespace packages.
+        # Non-namespace-package libs (e.g., charmhelpers) are available
+        # without having to reload the interpreter. :/
+        reload_interpreter(vpy if cfg.get('use_venv') else sys.argv[0])
+
+
+def reload_interpreter(python):
+    """
+    Reload the python interpreter to ensure that all deps are available.
+
+    Newly installed modules in namespace packages sometimes seemt to
+    not be picked up by Python 3.
+    """
+    os.execle(python, python, sys.argv[0], os.environ)
+
+
+def apt_install(packages):
+    """
+    Install apt packages.
+
+    This ensures a consistent set of options that are often missed but
+    should really be set.
+    """
+    if isinstance(packages, (str, bytes)):
+        packages = [packages]
+
+    env = os.environ.copy()
+
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    cmd = ['apt-get',
+           '--option=Dpkg::Options::=--force-confold',
+           '--assume-yes',
+           'install']
+    check_call(cmd + packages, env=env)
+
+
+def init_config_states():
+    import yaml
+    from charmhelpers.core import hookenv
+    from charms.reactive import set_state
+    from charms.reactive import toggle_state
+    config = hookenv.config()
+    config_defaults = {}
+    config_defs = {}
+    config_yaml = os.path.join(hookenv.charm_dir(), 'config.yaml')
+    if os.path.exists(config_yaml):
+        with open(config_yaml) as fp:
+            config_defs = yaml.safe_load(fp).get('options', {})
+            config_defaults = {key: value.get('default')
+                               for key, value in config_defs.items()}
+    for opt in config_defs.keys():
+        if config.changed(opt):
+            set_state('config.changed')
+            set_state('config.changed.{}'.format(opt))
+        toggle_state('config.set.{}'.format(opt), config.get(opt))
+        toggle_state('config.default.{}'.format(opt),
+                     config.get(opt) == config_defaults[opt])
+    hookenv.atexit(clear_config_states)
+
+
+def clear_config_states():
+    from charmhelpers.core import hookenv, unitdata
+    from charms.reactive import remove_state
+    config = hookenv.config()
+    remove_state('config.changed')
+    for opt in config.keys():
+        remove_state('config.changed.{}'.format(opt))
+        remove_state('config.set.{}'.format(opt))
+        remove_state('config.default.{}'.format(opt))
+    unitdata.kv().flush()
 
=== added file 'deps/layer/layer-basic/lib/charms/layer/execd.py'
--- deps/layer/layer-basic/lib/charms/layer/execd.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/lib/charms/layer/execd.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,138 @@
+# Copyright 2014-2016 Canonical Limited.
+#
+# This file is part of layer-basic, the reactive base layer for Juju.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+# This module may only import from the Python standard library.
+import os
+import sys
+import subprocess
+import time
+
+'''
+execd/preinstall
+
+It is often necessary to configure and reconfigure machines
+after provisioning, but before attempting to run the charm.
+Common examples are specialized network configuration, enabling
+of custom hardware, non-standard disk partitioning and filesystems,
+adding secrets and keys required for using a secured network.
+
+The reactive framework's base layer invokes this mechanism as
+early as possible, before any network access is made or dependencies
+unpacked or non-standard modules imported (including the charms.reactive
+framework itself).
+
+Operators needing to use this functionality may branch a charm and
+create an exec.d directory in it. The exec.d directory in turn contains
+one or more subdirectories, each of which contains an executable called
+charm-pre-install and any other required resources. The charm-pre-install
+executables are run, and if successful, state saved so they will not be
+run again.
+
+    $CHARM_DIR/exec.d/mynamespace/charm-pre-install
+
+An alternative to branching a charm is to compose a new charm that contains
+the exec.d directory, using the original charm as a layer,
+
+A charm author could also abuse this mechanism to modify the charm
+environment in unusual ways, but for most purposes it is saner to use
+charmhelpers.core.hookenv.atstart().
+'''
+
+
+def default_execd_dir():
+    return os.path.join(os.environ['CHARM_DIR'], 'exec.d')
+
+
+def execd_module_paths(execd_dir=None):
+    """Generate a list of full paths to modules within execd_dir."""
+    if not execd_dir:
+        execd_dir = default_execd_dir()
+
+    if not os.path.exists(execd_dir):
+        return
+
+    for subpath in os.listdir(execd_dir):
+        module = os.path.join(execd_dir, subpath)
+        if os.path.isdir(module):
+            yield module
+
+
+def execd_submodule_paths(command, execd_dir=None):
+    """Generate a list of full paths to the specified command within exec_dir.
+    """
+    for module_path in execd_module_paths(execd_dir):
+        path = os.path.join(module_path, command)
+        if os.access(path, os.X_OK) and os.path.isfile(path):
+            yield path
+
+
+def execd_sentinel_path(submodule_path):
+    module_path = os.path.dirname(submodule_path)
+    execd_path = os.path.dirname(module_path)
+    module_name = os.path.basename(module_path)
+    submodule_name = os.path.basename(submodule_path)
+    return os.path.join(execd_path,
+                        '.{}_{}.done'.format(module_name, submodule_name))
+
+
+def execd_run(command, execd_dir=None, stop_on_error=True, stderr=None):
+    """Run command for each module within execd_dir which defines it."""
+    if stderr is None:
+        stderr = sys.stdout
+    for submodule_path in execd_submodule_paths(command, execd_dir):
+        # Only run each execd once. We cannot simply run them in the
+        # install hook, as potentially storage hooks are run before that.
+        # We cannot rely on them being idempotent.
+        sentinel = execd_sentinel_path(submodule_path)
+        if os.path.exists(sentinel):
+            continue
+
+        try:
+            subprocess.check_call([submodule_path], stderr=stderr,
+                                  universal_newlines=True)
+            with open(sentinel, 'w') as f:
+                f.write('{} ran successfully {}\n'.format(submodule_path,
+                                                          time.ctime()))
+                f.write('Removing this file will cause it to be run again\n')
+        except subprocess.CalledProcessError as e:
+            # Logs get the details. We can't use juju-log, as the
+            # output may be substantial and exceed command line
+            # length limits.
+            print("ERROR ({}) running {}".format(e.returncode, e.cmd),
+                  file=stderr)
+            print("STDOUT<<EOM", file=stderr)
+            print(e.output, file=stderr)
+            print("EOM", file=stderr)
+
+            # Unit workload status gets a shorter fail message.
+            short_path = os.path.relpath(submodule_path)
+            block_msg = "Error ({}) running {}".format(e.returncode,
+                                                       short_path)
+            try:
+                subprocess.check_call(['status-set', 'blocked', block_msg],
+                                      universal_newlines=True)
+                if stop_on_error:
+                    sys.exit(0)  # Leave unit in blocked state.
+            except Exception:
+                pass  # We care about the exec.d/* failure, not status-set.
+
+            if stop_on_error:
+                sys.exit(e.returncode or 1)  # Error state for pre-1.24 Juju
+
+
+def execd_preinstall(execd_dir=None):
+    """Run charm-pre-install for each module within execd_dir."""
+    execd_run('charm-pre-install', execd_dir=execd_dir)
 
=== added file 'deps/layer/layer-basic/metadata.yaml'
--- deps/layer/layer-basic/metadata.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/metadata.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,1 @@
+{}
 
=== added directory 'deps/layer/layer-basic/reactive'
=== added file 'deps/layer/layer-basic/reactive/__init__.py'
=== added file 'deps/layer/layer-basic/requirements.txt'
--- deps/layer/layer-basic/requirements.txt	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/requirements.txt	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+flake8
+pytest
 
=== added file 'deps/layer/layer-basic/tox.ini'
--- deps/layer/layer-basic/tox.ini	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/tox.ini	2017-02-15 08:51:47 +0000
@@ -0,0 +1,12 @@
+[tox]
+skipsdist=True
+envlist = py34, py35
+skip_missing_interpreters = True
+
+[testenv]
+commands = py.test -v
+deps =
+    -r{toxinidir}/requirements.txt
+
+[flake8]
+exclude=docs
 
=== added file 'deps/layer/layer-basic/wheelhouse.txt'
--- deps/layer/layer-basic/wheelhouse.txt	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-basic/wheelhouse.txt	2017-02-15 08:51:47 +0000
@@ -0,0 +1,3 @@
+pip>=7.0.0,<8.2.0
+charmhelpers>=0.4.0,<1.0.0
+charms.reactive>=0.1.0,<2.0.0
 
=== added directory 'deps/layer/layer-leadership'
=== added file 'deps/layer/layer-leadership/.gitignore'
--- deps/layer/layer-leadership/.gitignore	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/.gitignore	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+*~
+*.pyc
 
=== added file 'deps/layer/layer-leadership/README.md'
--- deps/layer/layer-leadership/README.md	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/README.md	2017-02-15 08:51:47 +0000
@@ -0,0 +1,88 @@
+# Leadership Layer for Juju Charms
+
+The Leadership layer is for charm-tools and 'charm build', making it
+easier for layered charms to deal with Juju leadership.
+
+This layer will initialize charms.reactive states, allowing you to
+write handlers that will be activated by these states. It allows you
+to completely avoid writing leader-elected and leader-settings-changed
+hooks. As a simple example, these two handlers are all that is required
+to make the leader unit generate a password if it is not already set,
+and have the shared password stored in a file on all units:
+
+```python
+import charms.leadership
+from charmhelpers.core.host import pwgen
+
+
+@when('leadership.is_leader')
+@when_not('leadership.set.admin_password')
+def generate_secret():
+    charms.leadership.leader_set(admin_password=pwgen())
+
+
+@when('leadership.changed.admin_password')
+def store_secret():
+    write_file('/etc/foopass', leader_get('admin_password'))
+```
+
+
+## States
+
+The following states are set appropriately on startup, before any @hook
+decorated methods are invoked:
+
+* `leadership.is_leader`
+
+  This state is set when the unit is the leader. The unit will remain
+  the leader for the remainder of the hook, but may not be leader in
+  future hooks.
+
+* `leadership.set.{varname}`
+
+  This state is set for each leadership setting (ie. the
+  `leadership.set.foo` state will be set if the leader has set
+  the foo leadership setting to any value). It will remain
+  set for the remainder of the hook, unless the unit is the leader
+  and calls `reactive.leadership.leader_set()` and resets the value
+  to None.
+
+* `leadership.changed.{varname}`
+
+  This state is set for each leadership setting that has changed
+  since the last hook. It will remain set for the remainder of the
+  hook. It will not be set in the next hook, unless the leader has
+  changed the leadership setting yet again.
+
+* `leadership.changed`
+
+  One or more leadership settings has changed since the last hook.
+  This state will remain set for the remainder of the hook. It will
+  not be set in the next hook, unless the leader has made further
+  changes.
+
+
+## Methods
+
+The `charms.leadership` module exposes the `leader_set()` and
+`leader_get()` methods, which match the methods found in the
+`charmhelpers.core.hookenv` module. `reactive.leadership.leader_set()`
+should be used instead of the charmhelpers function to ensure that
+the reactive state is updated when the leadership settings are. If you
+do not do this, then you risk handlers waiting on these states to not
+be run on the leader (because when the leader changes settings, it 
+triggers leader-settings-changed hooks on the follower units but
+no hooks on itself).
+
+
+## Support
+
+This layer is maintained on Launchpad by
+Stuart Bishop ([e-mail]).
+
+Code is available using git at git+ssh://git.launchpad.net/layer-leadership.
+
+Bug reports can be made at https://bugs.launchpad.net/layer-leadership.
+
+Queries and comments can be made on the Juju mailing list, Juju IRC
+channels, or at https://answers.launchpad.net/layer-leadership.
 
=== added file 'deps/layer/layer-leadership/copyright'
--- deps/layer/layer-leadership/copyright	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/copyright	2017-02-15 08:51:47 +0000
@@ -0,0 +1,15 @@
+Copyright 2015-2016 Canonical Ltd.
+
+This file is part of the Leadership Layer for Juju.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
=== added file 'deps/layer/layer-leadership/layer.yaml'
--- deps/layer/layer-leadership/layer.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/layer.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,17 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Leadership Layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+includes:
+    - layer:basic
 
=== added directory 'deps/layer/layer-leadership/lib'
=== added directory 'deps/layer/layer-leadership/lib/charms'
=== added file 'deps/layer/layer-leadership/lib/charms/__init__.py'
--- deps/layer/layer-leadership/lib/charms/__init__.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/lib/charms/__init__.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
 
=== added file 'deps/layer/layer-leadership/lib/charms/leadership.py'
--- deps/layer/layer-leadership/lib/charms/leadership.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/lib/charms/leadership.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,58 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Leadership Layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from charmhelpers.core import hookenv
+from charmhelpers.core import unitdata
+
+from charms import reactive
+from charms.reactive import not_unless
+
+
+__all__ = ['leader_get', 'leader_set']
+
+
+@not_unless('leadership.is_leader')
+def leader_set(settings=None, **kw):
+    '''Change leadership settings, per charmhelpers.core.hookenv.leader_set.
+
+    The leadership.set.{key} reactive state will be set while the
+    leadership hook environment setting remains set.
+
+    Changed leadership settings will set the leadership.changed.{key}
+    and leadership.changed states. These states will remain set until
+    the following hook.
+
+    These state changes take effect immediately on the leader, and
+    in future hooks run on non-leaders. In this way both leaders and
+    non-leaders can share handlers, waiting on these states.
+    '''
+    settings = settings or {}
+    settings.update(kw)
+    previous = unitdata.kv().getrange('leadership.settings.', strip=True)
+
+    for key, value in settings.items():
+        if value != previous.get(key):
+            reactive.set_state('leadership.changed.{}'.format(key))
+            reactive.set_state('leadership.changed')
+        reactive.helpers.toggle_state('leadership.set.{}'.format(key),
+                                      value is not None)
+    hookenv.leader_set(settings)
+    unitdata.kv().update(settings, prefix='leadership.settings.')
+
+
+def leader_get(attribute=None):
+    '''Return leadership settings, per charmhelpers.core.hookenv.leader_get.'''
+    return hookenv.leader_get(attribute)
 
=== added directory 'deps/layer/layer-leadership/reactive'
=== added file 'deps/layer/layer-leadership/reactive/__init__.py'
=== added file 'deps/layer/layer-leadership/reactive/leadership.py'
--- deps/layer/layer-leadership/reactive/leadership.py	1970-01-01 00:00:00 +0000
+++ deps/layer/layer-leadership/reactive/leadership.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,68 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Leadership Layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from charmhelpers.core import hookenv
+from charmhelpers.core import unitdata
+
+from charms import reactive
+from charms.leadership import leader_get, leader_set
+
+
+__all__ = ['leader_get', 'leader_set']  # Backwards compatibility
+
+
+def initialize_leadership_state():
+    '''Initialize leadership.* states from the hook environment.
+
+    Invoked by hookenv.atstart() so states are available in
+    @hook decorated handlers.
+    '''
+    is_leader = hookenv.is_leader()
+    if is_leader:
+        hookenv.log('Initializing Leadership Layer (is leader)')
+    else:
+        hookenv.log('Initializing Leadership Layer (is follower)')
+
+    reactive.helpers.toggle_state('leadership.is_leader', is_leader)
+
+    previous = unitdata.kv().getrange('leadership.settings.', strip=True)
+    current = hookenv.leader_get()
+
+    # Handle deletions.
+    for key in set(previous.keys()) - set(current.keys()):
+        current[key] = None
+
+    any_changed = False
+    for key, value in current.items():
+        reactive.helpers.toggle_state('leadership.changed.{}'.format(key),
+                                      value != previous.get(key))
+        if value != previous.get(key):
+            any_changed = True
+        reactive.helpers.toggle_state('leadership.set.{}'.format(key),
+                                      value is not None)
+    reactive.helpers.toggle_state('leadership.changed', any_changed)
+
+    unitdata.kv().update(current, prefix='leadership.settings.')
+
+
+# Per https://github.com/juju-solutions/charms.reactive/issues/33,
+# this module may be imported multiple times so ensure the
+# initialization hook is only registered once. I have to piggy back
+# onto the namespace of a module imported before reactive discovery
+# to do this.
+if not hasattr(reactive, '_leadership_registered'):
+    hookenv.atstart(initialize_leadership_state)
+    reactive._leadership_registered = True
 
=== added directory 'deps/layer/trunk'
=== added file 'deps/layer/trunk/README.md'
--- deps/layer/trunk/README.md	1970-01-01 00:00:00 +0000
+++ deps/layer/trunk/README.md	2017-02-15 08:51:47 +0000
@@ -0,0 +1,57 @@
+# IBM base layer
+
+The IBM base layer is a common starting point for IBM related charms. Use this
+layer if you are building a layered charm with IBM software.
+
+## Usage
+
+This charm is a base layer and not meant to be built as a charm on its own.
+
+To use this layer, simply include the following in the runtime charm's
+layer.yaml file
+
+```yaml
+includes: ['layer:ibm-base']
+```
+
+## Configuration
+
+**curl_url** - Location of the IBM product installation file(s). This should be a
+URL that curl can use to download files. Multiple URLs should be separated
+by a space.
+
+**NOTE**: cryptographic verification is required and must be
+specified as part of the URL query string with the key a valid hash
+algorithms md5, sha256, or sha512, and the the checksum value itself
+(`http://<url>?[md5|sha256|sha512]=<checksum>`).
+
+For example:  
+
+* `http://example.com/file.tgz?sha256=<sum>`
+* `"sftp://example.com/file1.tgz?md5=<sum> ftp://example.com/file2.tgz?md5=<sum>"`
+
+**curl_options** - The options passed to the 'curl' command when fetching files
+from curl_url.
+
+For example:  
+
+* `"-u <user:password>"`
+
+**license_accepted** - Some IBM charms require acceptance of a license before
+installation can proceed. If required, setting this option to True indicates
+that you have read and accepted the IBM terms and conditions found in the
+license file referenced by the charm.
+
+## States
+
+**ibm-base.curl.resource.fetched** - When this state is set the IBM base layer has
+downloaded and verified the resources configured by curl_url. If the charm
+does not require any curl resources this state can be ignored.
+
+**ibm-base.license.accepted** - When this state is set the user has signified
+their acceptance of the license found in the charm. If the charm implements
+the Juju 'terms' feature this state can be safely ignored.
+
+## Contacts
+
+IBM Juju Support Team <[e-mail]>
 
=== added file 'deps/layer/trunk/config.yaml'
--- deps/layer/trunk/config.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/trunk/config.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,29 @@
+options:
+  curl_url:
+    type: string
+    default: ''
+    description: |
+      Location of the IBM product installation file(s). This should be a URL
+      that curl can use to download files. Multiple URLs should be separated
+      by a space. NOTE: cryptographic verification is required and must be
+      specified as part of the URL query string with the key a valid hash
+      algorithms md5, sha256, or sha512, and the the checksum value itself
+      (http://<url>?[md5|sha256|sha512]=<checksum>).
+      For example:
+        'http://example.com/file.tgz?sha256=<sum>'
+        'sftp://example.com/file1.tgz?md5=<sum> ftp://example.com/file2.tgz?md5=<sum>'
+  curl_opts:
+    type: string
+    default: ''
+    description: |
+      The options passed to the 'curl' command when fetching files from
+      curl_url. For example:
+        '-u <user:password>'
+  license_accepted:
+    type: boolean
+    default: False
+    description: |
+      Some IBM charms require acceptance of a license before installation
+      can proceed. If required, setting this option to True indicates that you
+      have read and accepted the IBM terms and conditions found in the license
+      file referenced by the charm.
 
=== added file 'deps/layer/trunk/layer.yaml'
--- deps/layer/trunk/layer.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/trunk/layer.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,9 @@
+includes:
+  - 'layer:basic'
+  - 'layer:apt'
+  - 'layer:leadership'
+options:
+  basic:
+    # Setting options for the basic layer.
+    packages:
+      - curl
 
=== added file 'deps/layer/trunk/metadata.yaml'
--- deps/layer/trunk/metadata.yaml	1970-01-01 00:00:00 +0000
+++ deps/layer/trunk/metadata.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,15 @@
+name: ibm-base
+summary: This layer provides a common base for IBM charms to build off of.
+maintainer: IBM Juju Support Team <[e-mail]>
+description: |
+  This layer provides license acceptance using the terms feature, it also
+  provides apt support from the apt layer, and Juju leadership from the
+  leadership layer.
+min-juju-version: '2.0-beta1'
+series:
+  - trusty
+  - xenial
+tags:
+  - ibm
+  - apt
+  - leadership
 
=== added directory 'deps/layer/trunk/reactive'
=== added file 'deps/layer/trunk/reactive/ibm-base.sh'
--- deps/layer/trunk/reactive/ibm-base.sh	1970-01-01 00:00:00 +0000
+++ deps/layer/trunk/reactive/ibm-base.sh	2017-02-15 08:51:47 +0000
@@ -0,0 +1,107 @@
+#!/bin/bash
+source charms.reactive.sh
+set -e
+
+
+# Utility function to verify a downloaded resource
+# :param: file name
+# :param: checksum type
+# :param: checksum value
+function verify_curl_resource() {
+  local FILE=$1
+  local TYPE=$2
+  local EXPECTED_SUM=$3
+  local CALCULATED_SUM=""
+  local PROG=""
+
+  if [ ! -r ${FILE} ]; then
+    status-set blocked "ibm-base: could not read ${FILE}"
+    juju-log "Could not verify the downloaded resource. File could not be read: ${FILE}"
+  fi
+
+  # Set our checksum utility based on the requested type
+  case "${TYPE}" in
+    md5)
+      PROG='md5sum'
+      ;;
+    sha256)
+      PROG='sha256sum'
+      ;;
+    sha512)
+      PROG='sha512sum'
+      ;;
+    *)
+      status-set blocked "ibm-base: checksum type must be md5, sha215, or sha512"
+      juju-log "Could not verify the downloaded resource ${FILE}. Unknown checksum type: ${TYPE}"
+      return 1
+  esac
+
+  CALCULATED_SUM=`${PROG} ${FILE} | awk '{print $1}'`
+  if [ "${CALCULATED_SUM}" = "${EXPECTED_SUM}" ]; then
+    juju-log "Checksum verified for ${FILE}."
+    return 0
+  else
+    status-set blocked "ibm-base: checksums did not match"
+    juju-log "Checksum mismatch for ${FILE}. Expected ${EXPECTED_SUM}, got ${CALCULATED_SUM}"
+    return 1
+  fi
+}
+
+
+# Fetch curl resources if a URL is configured
+@when 'config.set.curl_url'
+@when_any 'config.new.curl_url' 'config.changed.curl_url' 'config.new.curl_opts' 'config.changed.curl_opts'
+function fetch_curl_resource() {
+  local ARCHIVE_DIR="${CHARM_DIR}/files/archives"
+  local CURL_URL=$(config-get 'curl_url')
+  local CURL_OPTS=$(config-get 'curl_opts')
+
+  status-set maintenance "ibm-base: fetching resource(s)"
+
+  mkdir -p ${ARCHIVE_DIR}
+  cd ${ARCHIVE_DIR}
+  # Multiple URLs may be separated by a space, so loop.
+  for URL_STRING in ${CURL_URL}
+  do
+    # For each URL_STRING, set the url, checksum type, and checksum value.
+    local URL=${URL_STRING%%\?*}        # string before the first '?'
+    local FILE_NAME=${URL##*\/}         # string after the last '/'
+    local SUM_STRING=${URL_STRING#*\?}  # string after the first '?'
+    local SUM_TYPE=${SUM_STRING%%\=*}   # string before the first '='
+    local SUM_VALUE=${SUM_STRING#*\=}   # string after the first '='
+
+    if [ -z ${FILE_NAME} ]; then
+      FILE_NAME="juju-${RANDOM}"
+    fi
+    curl --silent --show-error ${CURL_OPTS} -o ${FILE_NAME} ${URL}
+
+    # Verify our resource checksum. If this fails, let verify_resource log
+    # the reason and exit successfully. Exiting non-zero would fail the hook,
+    # so return 0 and simply inform the user that verification failed.
+    verify_curl_resource ${FILE_NAME} ${SUM_TYPE} ${SUM_VALUE} || return 0
+  done
+  cd -
+
+  set_state 'ibm-base.curl.resource.fetched'
+  status-set active "ibm-base: curl resource(s) fetched"
+  juju-log 'Curl resource fetched'
+}
+
+
+# Handle license acceptance
+@when 'config.changed.license_accepted'
+function check_license_acceptance() {
+  local LIC_ACCEPTED=$(config-get 'license_accepted')
+
+  # compare lowercase LIC_ACCEPTED (requires bash > 4)
+  if [ "${LIC_ACCEPTED,,}" = "true" ]; then
+    set_state 'ibm-base.license.accepted'
+    juju-log 'License accepted'
+  else
+    remove_state 'ibm-base.license.accepted'
+    juju-log 'License NOT accepted'
+  fi
+}
+
+# Main reactive entry point
+reactive_handler_main
 
=== added directory 'hooks'
=== removed directory 'hooks'
=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== removed file 'hooks/config-changed'
--- hooks/config-changed	2015-06-10 10:01:41 +0000
+++ hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,242 +0,0 @@
-#!/bin/bash
-
-set -e
-MQ_INSTALL_PATH=/opt/mqm
-ARCHITECTURE=`uname -m`
-RPM_INSTALL_ARG="-ivh --nodeps --force-debian"
-if [ "$ARCHITECTURE" = "ppc64le" ]; then
-	RPM_INSTALL_ARG="-ivh --nodeps --force-debian --ignorearch"
-fi
-
-
-# Check whether MQ is installed
-is_mq_installed()
-{
-	if [ -d $MQ_INSTALL_PATH/bin ]; then
-		source $MQ_INSTALL_PATH/bin/setmqenv -s
-		if [ $? == 0 ]; then
-			source $MQ_INSTALL_PATH/bin/setmqenv -s
-			echo "True"
-		fi
-	else
-		echo "False"
-	fi
-}
-
-# Remove MQ, if installed
-remove_software()
-{
-
-	mq_installed=`is_mq_installed`
-	if  [ $mq_installed == True ]; then
-		juju-log "Removing IBM MQ software."
-
-		# Stop all queues
-		questr="QMNAME("
-		for queue in `$MQ_INSTALL_PATH/bin/dspmq -o installation | cut -d' ' -f1 `; 
-		do
-			# Get the queue manager name 
-			queue_mgr_name=${queue:${#questr}:${#queue}-${#questr}-1}
-			juju-log "Stopping queue manager $queue_mgr_name"
-			set +e
-			su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqm -w $queue_mgr_name"
-			su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqlsr -w -m $queue_mgr_name"
-			set -e
-		done
-		# Get list of packages and remove them
-		mq_rpms="`rpm -qa | grep MQSeries`"
-		juju-log "Removing package(s) $mq_rpms"
-		rpm -ev --force-debian $mq_rpms 
-	fi
-
-}
-
-# Remove MQ if license not accpeted
-remove_unaccepted_software()
-{
-
-	if  [ $1 == False ]; then
-		juju-log "Removing IBM MQ (if installed) as the license agreement is not accepted."
-		remove_software
-	fi 
-
-}
-
-# Update system configuration after installing MQ
-configure_system()
-{
-	juju-log "IBM MQ: Updating system configuration."
-
-	# Some containers do not allow system updates.
-	# Prevent the script from failing in such cases
-	set +e
-	shmmax=`sysctl kernel.shmmax | cut -d'=' -f2`
-	if [ $shmmax -lt 268435456 ];
-	then
-		sysctl -w kernel.shmmax=268435456
-	fi
-
-	fmax=`sysctl fs.file-max | cut -d'=' -f2`
-	if [ $fmax -lt 524288 ];
-	then
-		sysctl -w fs.file-max=524288
-	fi
-	sysctl -p
-
-	# Add user ubuntu to mqm group
-	adduser ubuntu mqm
-
-	# Update mqm file limits
-	if [ "`grep mqm  /etc/security/limits.conf`"=="" ]; then
-		sed -i 's/# End of file/mqm              hard    nofile          10240\nmqm              soft    nofile          10240\n# End of file/' /etc/security/limits.conf
-	fi
-	set -e
-	juju-log "IBM MQ: Completed system configuration update."
-
-}
-
-# Verify installation 
-verify_install()
-{
-
-	juju-log "IBM MQ: Verifying installation."
-
-	# Prevent the script from failing on failure. 
-	# It could because configure_system call failed
-	set +e
-
-	# Run as mqm user as root will not work
-
-	# Create queue manager
-	juju-log "IBM MQ: Create queue manager QMA."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/crtmqm QMA"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: queue manager QMA created."
-	else
-		juju-log "IBM MQ: Failed to create queue manager QMA."
-		exit 0
-	fi
-
-	# Start queue manager
-	juju-log "IBM MQ: Starting queue manager QMA."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/strmqm QMA"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: Queue manager QMA started."
-	else
-		juju-log "IBM MQ: Failed to start queue manager QMA."
-		exit 0
-	fi
-
-	# Create queue 
-	juju-log "IBM MQ: Creating queue."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/runmqsc QMA < $CHARM_DIR/files/archives/mq_create_queue.mqsc"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: Queue created."
-	else
-		juju-log "IBM MQ: Failed to create queue."
-		exit 0
-	fi
-
-	# Send message to queue
-	juju-log "IBM MQ: Sending message to queue."
-	su -l mqm -c "$MQ_INSTALL_PATH/samp/bin/amqsput QUEUE1 QMA <  $CHARM_DIR/files/archives/qinput"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: Message sent to queue."
-	else
-		juju-log "IBM MQ: Failed to send message to queue."
-		exit 0
-	fi
-
-	# Give MQ some time
-	sleep 5
-
-	# Receive message from queue
-	juju-log "IBM MQ: Receiving message from queue."
-	su -l mqm -c "$MQ_INSTALL_PATH/samp/bin/amqsget QUEUE1 QMA"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: Message received from queue."
-	else
-		juju-log "IBM MQ: Failed to receive message from queue."
-		exit 0
-	fi
-
-	# Clean up
-	# Delete queue
-	juju-log "IBM MQ: Deleting queue."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/runmqsc QMA < $CHARM_DIR/files/archives/mq_delete_queue.mqsc"
-	if [ $? == 0 ]; then
-		juju-log "IBM MQ: Deleted queue."
-	else
-		juju-log "IBM IB: Failed to delete queue."
-	fi
-	
-	# End queue manger
-	juju-log "IBM MQ: Stopping queue manager."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqm QMA"
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqlsr -w -m  QMA"
-	if [ $? -eq 0 ]; then
-		juju-log "IBM IB: Queue Manager is stopped."
-	else
-		juju-log "IBM IB: Queue Manager failed to stop."
-	fi
-
-	sleep 10
-
-	juju-log "IBM MQ: Deleting queue manager."
-	su -l mqm -c "$MQ_INSTALL_PATH/bin/dltmqm QMA"
-	if [ $? -eq 0 ]; then
-		juju-log "IBM IB: Queue Manager is deleted."
-	else
-		juju-log "IBM IB: Queue Manager could not be deleted."
-	fi
-
-	set -e
-	juju-log "IBM MQ: Install verification completed."
-
-}
-
-
-juju-log "IBM MQ: Begin config-change hook"
-mq_license_accepted=`config-get accept-ibm-mq-license`
-
-
-# Remove MQ if license not accepted and exit. Else install it
-remove_unaccepted_software $mq_license_accepted
-if [ $mq_license_accepted == False ]; then
-	juju-log "IBM MQ License not accepted."
-
-elif [ $mq_license_accepted == True ]; then
-
-	juju-log "License accepted"
-	mq_inst=`is_mq_installed`
-	if [ -f  $CHARM_DIR/files/archives/*.gz  ]; then
-		juju-log "IBM MQ: Extracting IBM MQ package."
-		tar xvfz $CHARM_DIR/files/archives/*.gz  --strip-components=1 -C $CHARM_DIR/files/archives 
-		rm -rf  $CHARM_DIR/files/archives/*.gz
-		juju-log "IBM MQ: Extracted IBM MQ package."
-		juju-log "Awaiting acceptance of IBM MQ license (see README on how to accept the license)."
-	fi
-	if  [ $mq_inst == False ]; then
-		# Check MQ package availability
-		if [ -f  $CHARM_DIR/files/archives/MQSeriesServer*rpm ] && [ -f  $CHARM_DIR/files/archives/MQSeriesRuntime*rpm ]; 
-		then 
-			echo "MQ Packages available for installation."; 
-			$CHARM_DIR/files/archives/mqlicense.sh -accept
-			juju-log "Installing available MQ packages."
-			rpm $RPM_INSTALL_ARG --prefix $MQ_INSTALL_PATH $CHARM_DIR/files/archives/MQSeries*rpm
-			juju-log "Installation of available MQ packages complete."
-			# Configure system values  for MQ
-			configure_system
-			#Verify installation
-			verify_install
-		else 
-			echo "MQ Packages missing. Please check README file."; 
-			echo "Upgrade MQ charm after adding the MQ packages"; 
-			exit 0
-		fi
-	fi
-else
-	juju-log " Acceptable values for license is 'True' or 'False'"
-
-fi
-juju-log "IBM MQ: End config-change hook"
 
=== added file 'hooks/hook.template'
--- hooks/hook.template	1970-01-01 00:00:00 +0000
+++ hooks/hook.template	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== removed file 'hooks/install'
--- hooks/install	2015-06-10 10:01:41 +0000
+++ hooks/install	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -e
-#Install RPM dependency
-juju-log "IBM MQ: Begin Install."
-
-# Get the architecture from the uname command.
-ARCHITECTURE=`uname -m`
-if [ "$ARCHITECTURE" != "x86_64" -a "$ARCHITECTURE" != "ppc64le" ]; then
-	juju-log "IBM MQ: Unsupported platform. IBM MQ installed with this Charm supports only the x86_64 and POWER LE (ppc64le) platforms."
-	exit 1
-fi
-
-# Install RPM 
-juju-log "IBM MQ: Downloading and installng RPM."
-apt-get install -y rpm 
-juju-log "IBM MQ: RPM downloaded and installed."
-
-# Extract IBM MQ archive file, if it  exists to files/archives 
-if [ -f  $CHARM_DIR/files/archives/*.gz  ]; then
-	juju-log "IBM MQ: Extracting IBM MQ package."
-	tar xvfz $CHARM_DIR/files/archives/*.gz  --strip-components=1 -C $CHARM_DIR/files/archives 
-	rm -rf  $CHARM_DIR/files/archives/*.gz
-	juju-log "IBM MQ: Extracted IBM MQ package."
-	juju-log "Awaiting acceptance of IBM MQ license (see README on how to accept the license)."
-else
-	juju-log "IBM MQ: IBM MQ packages not available. Refer the README on how to add it. Deploy the charm again after adding the package."
-fi
-
-juju-log "IBM MQ: End Install."
-
 
=== added file 'hooks/leader-elected'
--- hooks/leader-elected	1970-01-01 00:00:00 +0000
+++ hooks/leader-elected	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/leader-settings-changed'
--- hooks/leader-settings-changed	1970-01-01 00:00:00 +0000
+++ hooks/leader-settings-changed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/messaging-relation-broken'
--- hooks/messaging-relation-broken	1970-01-01 00:00:00 +0000
+++ hooks/messaging-relation-broken	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/messaging-relation-changed'
--- hooks/messaging-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/messaging-relation-changed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/messaging-relation-departed'
--- hooks/messaging-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/messaging-relation-departed	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/messaging-relation-joined'
--- hooks/messaging-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/messaging-relation-joined	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== removed file 'hooks/messaging-relation-joined'
--- hooks/messaging-relation-joined	2015-05-03 16:45:29 +0000
+++ hooks/messaging-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-juju-log "IBM MQ: Begin messaging-relation-joined hook." 
-set -e
-mq_license_accepted=`config-get accept-ibm-mq-license`
-if [ "$mq_license_accepted" == "False" ]; then
-	juju-log "IBM MQ: IBM MQ License is not accepted."
-	juju-log "Delete the relation. Accept the IBM MQ License, as per the README, before setting up any relation."
-	exit 0
-fi
-relation-set hostname=`unit-get private-address` port=1414
-juju-log "IBM MQ: End messaging-relation-joined hook." 
 
=== added directory 'hooks/relations'
=== added directory 'hooks/relations/ibm-mq'
=== added file 'hooks/relations/ibm-mq/README.md'
--- hooks/relations/ibm-mq/README.md	1970-01-01 00:00:00 +0000
+++ hooks/relations/ibm-mq/README.md	2017-02-15 08:51:47 +0000
@@ -0,0 +1,42 @@
+Overview
+-----------
+
+This interface layer handles the communication between `IBM MQ` and other charms that tries to communicate by sending each other data in messages through IBM-MQ rather than by calling each other directly.
+The provider end of this interface provides the Queue Manager name, Queue Name, IP Address and Port.
+The consumer/requires part will be any other charm and can get all the above values viz. Queue Manager name, Queue Name, IP Address and Port to send or receive messages. Here we are describing consumer charm as `ibm-was-base`
+
+
+Usage
+------
+
+#### Provides 
+IBM MQ product will provide this interface. This interface layer will set the following states, as appropriate:
+
+ - `{relation_name}.connected`: The relation is established, IBM-MQ is ready to send it's information.
+ 
+	- `get_consumer_hostname()` - returns/gets the consumer hostname to create a channel authentication rule that allows client system to use the channel by entering the MQSC command.
+
+	- `set_mq_details()` - Sets Queue Manager name, Queue Name, IP Address and Port for the connected services. 
+						As a Queue Name it sets a filename where MQSC Commands can be edited for further operation. 
+						
+	
+ - `{relation_name}.departed` : The relation has been removed. Any cleanup related to the consumer charm (e.g IBM WebSphere Server) should happen now on the Consumer charm since the consumer is going away.
+
+#### Requires
+
+Consumer charms e.g `IBM WebSphere Application Server` will require this interface to connect to IBM-MQ so that they can get the necessary information about `IBM-MQ` to send/receive messages to other Applications. 
+This interface layer will set the following states, as appropriate:
+
+- `{relation_name}.connected` : The consumer charm has been related to a IBM-MQ provider charm. 
+	At this point, the charm waits for Provider charm to send details like Queue Manager name, Queue Name, IP Address and Port.
+	
+	- `set_hostname()` - sets the `hostname`, so that IBM-MQ can get the consumer/client hostname to allow to send/receive messages.
+
+- `{relation_name}.ready` : The consumer charm e.g `IBM WebSphere Application Server` is now ready to access the details of IBM-MQ to send/recieve messages. Such as Queue Manager name, Queue Name, IP Address/hostname and Port.
+
+    - `get_qm_name()` - returns the `QM_Name` that IBM-MQ has created.
+	- `get_qname()`  - returns the `QName` that IBM-MQ has created.
+	- `get_mq_hostname()` - returns the `hostname` that IBM-MQ has created.
+	- `get_mq_port()` - returns the `MQ Port` that IBM-MQ has created.
+
+- `{relation_name}.departed` : The relation has been removed. Any cleanup related to the provider charm should happen now. 
 
=== added file 'hooks/relations/ibm-mq/__init__.py'
=== added file 'hooks/relations/ibm-mq/interface.yaml'
--- hooks/relations/ibm-mq/interface.yaml	1970-01-01 00:00:00 +0000
+++ hooks/relations/ibm-mq/interface.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,4 @@
+name: ibm-mq
+summary: Interface for relating to ibm-mq
+version: 1
+maintainer: "Juju Support <[e-mail]>"
 \ No newline at end of file
 
=== added file 'hooks/relations/ibm-mq/provides.py'
--- hooks/relations/ibm-mq/provides.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/ibm-mq/provides.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,50 @@
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class mqProvides(RelationBase):
+    # Every unit connecting will get the same information
+    scope = scopes.SERVICE
+
+    @hook('{provides:ibm-mq}-relation-joined')
+    def joined(self):
+        conversation = self.conversation()
+        conversation.remove_state('{relation_name}.departed')
+        conversation.set_state('{relation_name}.connected')
+
+    @hook('{provides:ibm-mq}-relation-departed')
+    def departed(self):
+        conversation = self.conversation()
+        conversation.remove_state('{relation_name}.connected')
+        conversation.set_state('{relation_name}.departed')
+
+    def dismiss(self, service):
+        conversation = self.conversation(service)
+        conversation.remove_state('{relation_name}.departed')
+
+    def reset_states(self, service):
+        conversation = self.conversation(service)
+        conversation.remove_state('{relation_name}.connected')
+        conversation.remove_state('{relation_name}.departed')
+
+    def set_mq_details(self, service, QM_Name, Qname, host, port):
+        conversation = self.conversation(service)
+        conversation.set_remote(data={
+            'QM_Name': QM_Name,
+            'Qname': Qname,
+            'host': host,
+            'port': port,
+        })
+
+    def get_consumer_hostname(self):
+        return self.get_remote('host')
+
+    def services(self):
+        """
+        Return a list of services requesting MQ.
+        """
+        service = []
+        for conversation in self.conversations():
+            service.append(conversation.scope)
+        return service
 
=== added file 'hooks/relations/ibm-mq/requires.py'
--- hooks/relations/ibm-mq/requires.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/ibm-mq/requires.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,42 @@
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class mq1Requires(RelationBase):
+    scope = scopes.GLOBAL
+
+    @hook('{requires:ibm-mq}-relation-joined')
+    def joined(self):
+        self.remove_state('{relation_name}.departed')
+        self.set_state('{relation_name}.connected')
+
+    @hook('{requires:ibm-mq}-relation-changed')
+    def changed(self):
+        if str(self.get_remote('port')) != "None":
+            self.set_state('{relation_name}.ready')
+            print("Status is relation_name.ready in requires")
+
+    @hook('{requires:ibm-mq}-relation-departed')
+    def departed(self):
+        self.remove_state('{relation_name}.connected')
+        self.remove_state('{relation_name}.ready')
+        self.set_state('{relation_name}.departed')
+
+    def set_hostname(self, host):
+        conversation = self.conversation()
+        conversation.set_remote(data={
+            'host': host,
+        })
+
+    def get_qm_name(self):
+        return self.get_remote('QM_Name')
+
+    def get_qname(self):
+        return self.get_remote('Qname')
+
+    def get_mq_hostname(self):
+        return self.get_remote('host')
+
+    def get_mq_port(self):
+        return self.get_remote('port')
 
=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== removed file 'hooks/start'
--- hooks/start	2015-03-06 08:32:33 +0000
+++ hooks/start	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Juju command to open port 
-
-set -e
-juju-log "IBM MQ: Begin Start hook"
-open-port 1414/TCP
-juju-log "IBM MQ: End Start hook"
 
=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== removed file 'hooks/stop'
--- hooks/stop	2015-03-06 08:32:33 +0000
+++ hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-juju-log "IBM MQ: Begin Stop hook"
-close-port 1414/TCP
-juju-log "IBM MQ: End Stop hook"
 
=== added file 'hooks/update-status'
--- hooks/update-status	1970-01-01 00:00:00 +0000
+++ hooks/update-status	2017-02-15 08:51:47 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import sys
+sys.path.append('lib')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2017-02-15 08:51:47 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+# Load modules from $CHARM_DIR/lib
+import os
+import sys
+sys.path.append('lib')
+
+# This is an upgrade-charm context, make sure we install latest deps
+if not os.path.exists('wheelhouse/.upgrade'):
+    open('wheelhouse/.upgrade', 'w').close()
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        os.unlink('wheelhouse/.bootstrapped')
+else:
+    os.unlink('wheelhouse/.upgrade')
+
+from charms.layer import basic
+basic.bootstrap_charm_deps()
+basic.init_config_states()
+
+
+# This will load and run the appropriate @hook and other decorated
+# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
+# and $CHARM_DIR/hooks/relations.
+#
+# See https://jujucharms.com/docs/stable/authors-charm-building
+# for more information on this pattern.
+from charms.reactive import main
+main()
 
=== added file 'layer.yaml'
--- layer.yaml	1970-01-01 00:00:00 +0000
+++ layer.yaml	2017-02-15 08:51:47 +0000
@@ -0,0 +1,21 @@
+"options":
+  "basic":
+    "packages":
+    - "curl"
+    - "rpm"
+    "use_venv": !!bool "false"
+    "include_system_packages": !!bool "false"
+  "ibm-base": {}
+  "leadership": {}
+  "ibm-mq": {}
+  "apt":
+    "packages": []
+"includes":
+- "layer:basic"
+- "layer:basic"
+- "layer:apt"
+- "layer:leadership"
+- "layer:ibm-base"
+- "interface:ibm-mq"
+"repo": "bzr+ssh://bazaar.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-mq/trunk/"
+"is": "ibm-mq"
 
=== added directory 'lib'
=== added directory 'lib/charms'
=== added file 'lib/charms/__init__.py'
--- lib/charms/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/charms/__init__.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
 
=== added file 'lib/charms/apt.py'
--- lib/charms/apt.py	1970-01-01 00:00:00 +0000
+++ lib/charms/apt.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,182 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Apt layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+'''
+charms.reactive helpers for dealing with deb packages.
+
+Add apt package sources using add_source(). Queue deb packages for
+installation with install(). Configure and work with your software
+once the apt.installed.{packagename} state is set.
+'''
+import itertools
+import subprocess
+
+from charmhelpers import fetch
+from charmhelpers.core import hookenv, unitdata
+from charms import reactive
+
+
+__all__ = ['add_source', 'update', 'queue_install', 'install_queued',
+           'installed', 'purge', 'ensure_package_status']
+
+
+def add_source(source, key=None):
+    '''Add an apt source.
+
+    Sets the apt.needs_update state.
+
+    A source may be either a line that can be added directly to
+    sources.list(5), or in the form ppa:<user>/<ppa-name> for adding
+    Personal Package Archives, or a distribution component to enable.
+
+    The package signing key should be an ASCII armoured GPG key. While
+    GPG key ids are also supported, the retrieval mechanism is insecure.
+    There is no need to specify the package signing key for PPAs or for
+    the main Ubuntu archives.
+    '''
+    # Maybe we should remember which sources have been added already
+    # so we don't waste time re-adding them. Is this time significant?
+    fetch.add_source(source, key)
+    reactive.set_state('apt.needs_update')
+
+
+def queue_install(packages, options=None):
+    """Queue one or more deb packages for install.
+
+    The `apt.installed.{name}` state is set once the package is installed.
+
+    If a package has already been installed it will not be reinstalled.
+
+    If a package has already been queued it will not be requeued, and
+    the install options will not be changed.
+
+    Sets the apt.queued_installs state.
+    """
+    if isinstance(packages, str):
+        packages = [packages]
+    # Filter installed packages.
+    store = unitdata.kv()
+    queued_packages = store.getrange('apt.install_queue.', strip=True)
+    packages = {package: options for package in packages
+                if not (package in queued_packages or
+                        reactive.helpers.is_state('apt.installed.' + package))}
+    if packages:
+        unitdata.kv().update(packages, prefix='apt.install_queue.')
+        reactive.set_state('apt.queued_installs')
+
+
+def installed():
+    '''Return the set of deb packages completed install'''
+    return set(state.split('.', 2)[2] for state in reactive.bus.get_states()
+               if state.startswith('apt.installed.'))
+
+
+def purge(packages):
+    """Purge one or more deb packages from the system"""
+    fetch.apt_purge(packages, fatal=True)
+    store = unitdata.kv()
+    store.unsetrange(packages, prefix='apt.install_queue.')
+    for package in packages:
+        reactive.remove_state('apt.installed.{}'.format(package))
+
+
+def update():
+    """Update the apt cache.
+
+    Removes the apt.needs_update state.
+    """
+    status_set(None, 'Updating apt cache')
+    fetch.apt_update(fatal=True)  # Friends don't let friends set fatal=False
+    reactive.remove_state('apt.needs_update')
+
+
+def install_queued():
+    '''Installs queued deb packages.
+
+    Removes the apt.queued_installs state and sets the apt.installed state.
+
+    On failure, sets the unit's workload state to 'blocked' and returns
+    False. Package installs remain queued.
+
+    On success, sets the apt.installed.{packagename} state for each
+    installed package and returns True.
+    '''
+    store = unitdata.kv()
+    queue = sorted((options, package)
+                   for package, options in store.getrange('apt.install_queue.',
+                                                          strip=True).items())
+
+    installed = set()
+    for options, batch in itertools.groupby(queue, lambda x: x[0]):
+        packages = [b[1] for b in batch]
+        try:
+            status_set(None, 'Installing {}'.format(','.join(packages)))
+            fetch.apt_install(packages, options, fatal=True)
+            store.unsetrange(packages, prefix='apt.install_queue.')
+            installed.update(packages)
+        except subprocess.CalledProcessError:
+            status_set('blocked',
+                       'Unable to install packages {}'
+                       .format(','.join(packages)))
+            return False  # Without setting reactive state.
+
+    for package in installed:
+        reactive.set_state('apt.installed.{}'.format(package))
+
+    reactive.remove_state('apt.queued_installs')
+    return True
+
+
+def ensure_package_status():
+    '''Hold or unhold packages per the package_status configuration option.
+
+    All packages installed using this module and handlers are affected.
+
+    An mechanism may be added in the future to override this for a
+    subset of installed packages.
+    '''
+    packages = installed()
+    if not packages:
+        return
+    config = hookenv.config()
+    package_status = config['package_status']
+    changed = reactive.helpers.data_changed('apt.package_status',
+                                            (package_status, sorted(packages)))
+    if changed:
+        if package_status == 'hold':
+            hookenv.log('Holding packages {}'.format(','.join(packages)))
+            fetch.apt_hold(packages)
+        else:
+            hookenv.log('Unholding packages {}'.format(','.join(packages)))
+            fetch.apt_unhold(packages)
+    reactive.remove_state('apt.needs_hold')
+
+
+def status_set(state, message):
+    """Set the unit's workload status.
+
+    Set state == None to keep the same state and just change the message.
+    """
+    if state is None:
+        state = hookenv.status_get()[0]
+        if state == 'unknown':
+            state = 'maintenance'  # Guess
+    if state in ('error', 'blocked'):
+        lvl = hookenv.WARNING
+    else:
+        lvl = hookenv.INFO
+    hookenv.status_set(state, message)
+    hookenv.log('{}: {}'.format(state, message), lvl)
 
=== added directory 'lib/charms/layer'
=== added file 'lib/charms/layer/__init__.py'
--- lib/charms/layer/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/charms/layer/__init__.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,21 @@
+import os
+
+
+class LayerOptions(dict):
+    def __init__(self, layer_file, section=None):
+        import yaml  # defer, might not be available until bootstrap
+        with open(layer_file) as f:
+            layer = yaml.safe_load(f.read())
+        opts = layer.get('options', {})
+        if section and section in opts:
+            super(LayerOptions, self).__init__(opts.get(section))
+        else:
+            super(LayerOptions, self).__init__(opts)
+
+
+def options(section=None, layer_file=None):
+    if not layer_file:
+        base_dir = os.environ.get('CHARM_DIR', os.getcwd())
+        layer_file = os.path.join(base_dir, 'layer.yaml')
+
+    return LayerOptions(layer_file, section)
 
=== added file 'lib/charms/layer/basic.py'
--- lib/charms/layer/basic.py	1970-01-01 00:00:00 +0000
+++ lib/charms/layer/basic.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,159 @@
+import os
+import sys
+import shutil
+import platform
+from glob import glob
+from subprocess import check_call
+
+from charms.layer.execd import execd_preinstall
+
+
+def bootstrap_charm_deps():
+    """
+    Set up the base charm dependencies so that the reactive system can run.
+    """
+    # execd must happen first, before any attempt to install packages or
+    # access the network, because sites use this hook to do bespoke
+    # configuration and install secrets so the rest of this bootstrap
+    # and the charm itself can actually succeed. This call does nothing
+    # unless the operator has created and populated $CHARM_DIR/exec.d.
+    execd_preinstall()
+    # ensure that $CHARM_DIR/bin is on the path, for helper scripts
+    os.environ['PATH'] += ':%s' % os.path.join(os.environ['CHARM_DIR'], 'bin')
+    venv = os.path.abspath('../.venv')
+    vbin = os.path.join(venv, 'bin')
+    vpip = os.path.join(vbin, 'pip')
+    vpy = os.path.join(vbin, 'python')
+    if os.path.exists('wheelhouse/.bootstrapped'):
+        from charms import layer
+        cfg = layer.options('basic')
+        if cfg.get('use_venv') and '.venv' not in sys.executable:
+            # activate the venv
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            reload_interpreter(vpy)
+        return
+    # bootstrap wheelhouse
+    if os.path.exists('wheelhouse'):
+        with open('/root/.pydistutils.cfg', 'w') as fp:
+            # make sure that easy_install also only uses the wheelhouse
+            # (see https://github.com/pypa/pip/issues/410)
+            charm_dir = os.environ['CHARM_DIR']
+            fp.writelines([
+                "[easy_install]\n",
+                "allow_hosts = ''\n",
+                "find_links = file://{}/wheelhouse/\n".format(charm_dir),
+            ])
+        apt_install(['python3-pip', 'python3-setuptools', 'python3-yaml'])
+        from charms import layer
+        cfg = layer.options('basic')
+        # include packages defined in layer.yaml
+        apt_install(cfg.get('packages', []))
+        # if we're using a venv, set it up
+        if cfg.get('use_venv'):
+            if not os.path.exists(venv):
+                distname, version, series = platform.linux_distribution()
+                if series in ('precise', 'trusty'):
+                    apt_install(['python-virtualenv'])
+                else:
+                    apt_install(['virtualenv'])
+                cmd = ['virtualenv', '-ppython3', '--never-download', venv]
+                if cfg.get('include_system_packages'):
+                    cmd.append('--system-site-packages')
+                check_call(cmd)
+            os.environ['PATH'] = ':'.join([vbin, os.environ['PATH']])
+            pip = vpip
+        else:
+            pip = 'pip3'
+            # save a copy of system pip to prevent `pip3 install -U pip`
+            # from changing it
+            if os.path.exists('/usr/bin/pip'):
+                shutil.copy2('/usr/bin/pip', '/usr/bin/pip.save')
+        # need newer pip, to fix spurious Double Requirement error:
+        # https://github.com/pypa/pip/issues/56
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse',
+                    'pip'])
+        # install the rest of the wheelhouse deps
+        check_call([pip, 'install', '-U', '--no-index', '-f', 'wheelhouse'] +
+                   glob('wheelhouse/*'))
+        if not cfg.get('use_venv'):
+            # restore system pip to prevent `pip3 install -U pip`
+            # from changing it
+            if os.path.exists('/usr/bin/pip.save'):
+                shutil.copy2('/usr/bin/pip.save', '/usr/bin/pip')
+                os.remove('/usr/bin/pip.save')
+        os.remove('/root/.pydistutils.cfg')
+        # flag us as having already bootstrapped so we don't do it again
+        open('wheelhouse/.bootstrapped', 'w').close()
+        # Ensure that the newly bootstrapped libs are available.
+        # Note: this only seems to be an issue with namespace packages.
+        # Non-namespace-package libs (e.g., charmhelpers) are available
+        # without having to reload the interpreter. :/
+        reload_interpreter(vpy if cfg.get('use_venv') else sys.argv[0])
+
+
+def reload_interpreter(python):
+    """
+    Reload the python interpreter to ensure that all deps are available.
+
+    Newly installed modules in namespace packages sometimes seemt to
+    not be picked up by Python 3.
+    """
+    os.execle(python, python, sys.argv[0], os.environ)
+
+
+def apt_install(packages):
+    """
+    Install apt packages.
+
+    This ensures a consistent set of options that are often missed but
+    should really be set.
+    """
+    if isinstance(packages, (str, bytes)):
+        packages = [packages]
+
+    env = os.environ.copy()
+
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    cmd = ['apt-get',
+           '--option=Dpkg::Options::=--force-confold',
+           '--assume-yes',
+           'install']
+    check_call(cmd + packages, env=env)
+
+
+def init_config_states():
+    import yaml
+    from charmhelpers.core import hookenv
+    from charms.reactive import set_state
+    from charms.reactive import toggle_state
+    config = hookenv.config()
+    config_defaults = {}
+    config_defs = {}
+    config_yaml = os.path.join(hookenv.charm_dir(), 'config.yaml')
+    if os.path.exists(config_yaml):
+        with open(config_yaml) as fp:
+            config_defs = yaml.safe_load(fp).get('options', {})
+            config_defaults = {key: value.get('default')
+                               for key, value in config_defs.items()}
+    for opt in config_defs.keys():
+        if config.changed(opt):
+            set_state('config.changed')
+            set_state('config.changed.{}'.format(opt))
+        toggle_state('config.set.{}'.format(opt), config.get(opt))
+        toggle_state('config.default.{}'.format(opt),
+                     config.get(opt) == config_defaults[opt])
+    hookenv.atexit(clear_config_states)
+
+
+def clear_config_states():
+    from charmhelpers.core import hookenv, unitdata
+    from charms.reactive import remove_state
+    config = hookenv.config()
+    remove_state('config.changed')
+    for opt in config.keys():
+        remove_state('config.changed.{}'.format(opt))
+        remove_state('config.set.{}'.format(opt))
+        remove_state('config.default.{}'.format(opt))
+    unitdata.kv().flush()
 
=== added file 'lib/charms/layer/execd.py'
--- lib/charms/layer/execd.py	1970-01-01 00:00:00 +0000
+++ lib/charms/layer/execd.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,138 @@
+# Copyright 2014-2016 Canonical Limited.
+#
+# This file is part of layer-basic, the reactive base layer for Juju.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+# This module may only import from the Python standard library.
+import os
+import sys
+import subprocess
+import time
+
+'''
+execd/preinstall
+
+It is often necessary to configure and reconfigure machines
+after provisioning, but before attempting to run the charm.
+Common examples are specialized network configuration, enabling
+of custom hardware, non-standard disk partitioning and filesystems,
+adding secrets and keys required for using a secured network.
+
+The reactive framework's base layer invokes this mechanism as
+early as possible, before any network access is made or dependencies
+unpacked or non-standard modules imported (including the charms.reactive
+framework itself).
+
+Operators needing to use this functionality may branch a charm and
+create an exec.d directory in it. The exec.d directory in turn contains
+one or more subdirectories, each of which contains an executable called
+charm-pre-install and any other required resources. The charm-pre-install
+executables are run, and if successful, state saved so they will not be
+run again.
+
+    $CHARM_DIR/exec.d/mynamespace/charm-pre-install
+
+An alternative to branching a charm is to compose a new charm that contains
+the exec.d directory, using the original charm as a layer,
+
+A charm author could also abuse this mechanism to modify the charm
+environment in unusual ways, but for most purposes it is saner to use
+charmhelpers.core.hookenv.atstart().
+'''
+
+
+def default_execd_dir():
+    return os.path.join(os.environ['CHARM_DIR'], 'exec.d')
+
+
+def execd_module_paths(execd_dir=None):
+    """Generate a list of full paths to modules within execd_dir."""
+    if not execd_dir:
+        execd_dir = default_execd_dir()
+
+    if not os.path.exists(execd_dir):
+        return
+
+    for subpath in os.listdir(execd_dir):
+        module = os.path.join(execd_dir, subpath)
+        if os.path.isdir(module):
+            yield module
+
+
+def execd_submodule_paths(command, execd_dir=None):
+    """Generate a list of full paths to the specified command within exec_dir.
+    """
+    for module_path in execd_module_paths(execd_dir):
+        path = os.path.join(module_path, command)
+        if os.access(path, os.X_OK) and os.path.isfile(path):
+            yield path
+
+
+def execd_sentinel_path(submodule_path):
+    module_path = os.path.dirname(submodule_path)
+    execd_path = os.path.dirname(module_path)
+    module_name = os.path.basename(module_path)
+    submodule_name = os.path.basename(submodule_path)
+    return os.path.join(execd_path,
+                        '.{}_{}.done'.format(module_name, submodule_name))
+
+
+def execd_run(command, execd_dir=None, stop_on_error=True, stderr=None):
+    """Run command for each module within execd_dir which defines it."""
+    if stderr is None:
+        stderr = sys.stdout
+    for submodule_path in execd_submodule_paths(command, execd_dir):
+        # Only run each execd once. We cannot simply run them in the
+        # install hook, as potentially storage hooks are run before that.
+        # We cannot rely on them being idempotent.
+        sentinel = execd_sentinel_path(submodule_path)
+        if os.path.exists(sentinel):
+            continue
+
+        try:
+            subprocess.check_call([submodule_path], stderr=stderr,
+                                  universal_newlines=True)
+            with open(sentinel, 'w') as f:
+                f.write('{} ran successfully {}\n'.format(submodule_path,
+                                                          time.ctime()))
+                f.write('Removing this file will cause it to be run again\n')
+        except subprocess.CalledProcessError as e:
+            # Logs get the details. We can't use juju-log, as the
+            # output may be substantial and exceed command line
+            # length limits.
+            print("ERROR ({}) running {}".format(e.returncode, e.cmd),
+                  file=stderr)
+            print("STDOUT<<EOM", file=stderr)
+            print(e.output, file=stderr)
+            print("EOM", file=stderr)
+
+            # Unit workload status gets a shorter fail message.
+            short_path = os.path.relpath(submodule_path)
+            block_msg = "Error ({}) running {}".format(e.returncode,
+                                                       short_path)
+            try:
+                subprocess.check_call(['status-set', 'blocked', block_msg],
+                                      universal_newlines=True)
+                if stop_on_error:
+                    sys.exit(0)  # Leave unit in blocked state.
+            except Exception:
+                pass  # We care about the exec.d/* failure, not status-set.
+
+            if stop_on_error:
+                sys.exit(e.returncode or 1)  # Error state for pre-1.24 Juju
+
+
+def execd_preinstall(execd_dir=None):
+    """Run charm-pre-install for each module within execd_dir."""
+    execd_run('charm-pre-install', execd_dir=execd_dir)
 
=== added file 'lib/charms/leadership.py'
--- lib/charms/leadership.py	1970-01-01 00:00:00 +0000
+++ lib/charms/leadership.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,58 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Leadership Layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from charmhelpers.core import hookenv
+from charmhelpers.core import unitdata
+
+from charms import reactive
+from charms.reactive import not_unless
+
+
+__all__ = ['leader_get', 'leader_set']
+
+
+@not_unless('leadership.is_leader')
+def leader_set(settings=None, **kw):
+    '''Change leadership settings, per charmhelpers.core.hookenv.leader_set.
+
+    The leadership.set.{key} reactive state will be set while the
+    leadership hook environment setting remains set.
+
+    Changed leadership settings will set the leadership.changed.{key}
+    and leadership.changed states. These states will remain set until
+    the following hook.
+
+    These state changes take effect immediately on the leader, and
+    in future hooks run on non-leaders. In this way both leaders and
+    non-leaders can share handlers, waiting on these states.
+    '''
+    settings = settings or {}
+    settings.update(kw)
+    previous = unitdata.kv().getrange('leadership.settings.', strip=True)
+
+    for key, value in settings.items():
+        if value != previous.get(key):
+            reactive.set_state('leadership.changed.{}'.format(key))
+            reactive.set_state('leadership.changed')
+        reactive.helpers.toggle_state('leadership.set.{}'.format(key),
+                                      value is not None)
+    hookenv.leader_set(settings)
+    unitdata.kv().update(settings, prefix='leadership.settings.')
+
+
+def leader_get(attribute=None):
+    '''Return leadership settings, per charmhelpers.core.hookenv.leader_get.'''
+    return hookenv.leader_get(attribute)
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-12-09 06:50:47 +0000
+++ metadata.yaml	2017-02-15 08:51:47 +0000
@@ -1,14 +1,19 @@
-name: ibm-mq
-summary: IBM MQ Messaging product
-maintainer: Juju Support <[e-mail]>
-description: |
-  IBM MQ provides for messaging services to transport multiple types of 
-  data. 
-tags:
-  - misc
-  - messaging
-  - ibm
-subordinate: false
-provides:
-  messaging:
-    interface: ibm-mq
+"name": "ibm-mq"
+"summary": "IBM MQ messaging Product"
+"maintainer": "IBM Juju Support Team <[e-mail]>"
+"description": |
+  IBM MQ provides for messaging services to transport multiple types of data.
+"tags":
+- "ibm"
+- "ibm"
+- "apt"
+- "leadership"
+- "mq"
+- "misc"
+- "ibm"
+- "messaging"
+"provides":
+  "messaging":
+    "interface": "ibm-mq"
+"min-juju-version": "2.0-beta1"
+"subordinate": !!bool "false"
 
=== added directory 'reactive'
=== added file 'reactive/__init__.py'
=== added file 'reactive/apt.py'
--- reactive/apt.py	1970-01-01 00:00:00 +0000
+++ reactive/apt.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,131 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Apt layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+'''
+charms.reactive helpers for dealing with deb packages.
+
+Add apt package sources using add_source(). Queue deb packages for
+installation with install(). Configure and work with your software
+once the apt.installed.{packagename} state is set.
+'''
+import subprocess
+
+from charmhelpers import fetch
+from charmhelpers.core import hookenv
+from charmhelpers.core.hookenv import WARNING
+from charms import layer
+from charms import reactive
+from charms.reactive import when, when_not
+
+import charms.apt
+
+
+@when('apt.needs_update')
+def update():
+    charms.apt.update()
+
+
+@when('apt.queued_installs')
+@when_not('apt.needs_update')
+def install_queued():
+    charms.apt.install_queued()
+
+
+@when_not('apt.queued_installs')
+def ensure_package_status():
+    charms.apt.ensure_package_status()
+
+
+def filter_installed_packages(packages):
+    # Don't use fetch.filter_installed_packages, as it depends on python-apt
+    # and not available if the basic layer's use_site_packages option is off
+    # TODO: Move this to charm-helpers.fetch
+    cmd = ['dpkg-query', '--show', r'--showformat=${Package}\n']
+    installed = set(subprocess.check_output(cmd,
+                                            universal_newlines=True).split())
+    return set(packages) - installed
+
+
+def clear_removed_package_states():
+    """On hook startup, clear install states for removed packages."""
+    removed = filter_installed_packages(charms.apt.installed())
+    if removed:
+        hookenv.log('{} missing packages ({})'.format(len(removed),
+                                                      ','.join(removed)),
+                    WARNING)
+        for package in removed:
+            reactive.remove_state('apt.installed.{}'.format(package))
+
+
+def configure_sources():
+    """Add user specified package sources from the service configuration.
+
+    See charmhelpers.fetch.configure_sources for details.
+    """
+    config = hookenv.config()
+
+    # We don't have enums, so we need to validate this ourselves.
+    package_status = config.get('package_status')
+    if package_status not in ('hold', 'install'):
+        charms.apt.status_set('blocked',
+                              'Unknown package_status {}'
+                              ''.format(package_status))
+        # Die before further hooks are run. This isn't very nice, but
+        # there is no other way to inform the operator that they have
+        # invalid configuration.
+        raise SystemExit(0)
+
+    sources = config.get('install_sources')
+    keys = config.get('install_keys')
+    if reactive.helpers.data_changed('apt.configure_sources', (sources, keys)):
+        fetch.configure_sources(update=False,
+                                sources_var='install_sources',
+                                keys_var='install_keys')
+        reactive.set_state('apt.needs_update')
+
+    extra_packages = sorted(config.get('extra_packages', '').split())
+    if extra_packages:
+        charms.apt.queue_install(extra_packages)
+
+
+def queue_layer_packages():
+    """Add packages listed in build-time layer options."""
+    # Both basic and apt layer. basic layer will have already installed
+    # its defined packages, but rescheduling it here gets the apt layer
+    # state set and they will pinned as any other apt layer installed
+    # package.
+    opts = layer.options()
+    for section in ['basic', 'apt']:
+        if section in opts and 'packages' in opts[section]:
+            charms.apt.queue_install(opts[section]['packages'])
+
+
+# Per https://github.com/juju-solutions/charms.reactive/issues/33,
+# this module may be imported multiple times so ensure the
+# initialization hook is only registered once. I have to piggy back
+# onto the namespace of a module imported before reactive discovery
+# to do this.
+if not hasattr(reactive, '_apt_registered'):
+    # We need to register this to run every hook, not just during install
+    # and config-changed, to protect against race conditions. If we don't
+    # do this, then the config in the hook environment may show updates
+    # to running hooks well before the config-changed hook has been invoked
+    # and the intialization provided an opertunity to be run.
+    hookenv.atstart(hookenv.log, 'Initializing Apt Layer')
+    hookenv.atstart(clear_removed_package_states)
+    hookenv.atstart(configure_sources)
+    hookenv.atstart(queue_layer_packages)
+    reactive._apt_registered = True
 
=== added file 'reactive/ibm-base.sh'
--- reactive/ibm-base.sh	1970-01-01 00:00:00 +0000
+++ reactive/ibm-base.sh	2017-02-15 08:51:47 +0000
@@ -0,0 +1,107 @@
+#!/bin/bash
+source charms.reactive.sh
+set -e
+
+
+# Utility function to verify a downloaded resource
+# :param: file name
+# :param: checksum type
+# :param: checksum value
+function verify_curl_resource() {
+  local FILE=$1
+  local TYPE=$2
+  local EXPECTED_SUM=$3
+  local CALCULATED_SUM=""
+  local PROG=""
+
+  if [ ! -r ${FILE} ]; then
+    status-set blocked "ibm-base: could not read ${FILE}"
+    juju-log "Could not verify the downloaded resource. File could not be read: ${FILE}"
+  fi
+
+  # Set our checksum utility based on the requested type
+  case "${TYPE}" in
+    md5)
+      PROG='md5sum'
+      ;;
+    sha256)
+      PROG='sha256sum'
+      ;;
+    sha512)
+      PROG='sha512sum'
+      ;;
+    *)
+      status-set blocked "ibm-base: checksum type must be md5, sha215, or sha512"
+      juju-log "Could not verify the downloaded resource ${FILE}. Unknown checksum type: ${TYPE}"
+      return 1
+  esac
+
+  CALCULATED_SUM=`${PROG} ${FILE} | awk '{print $1}'`
+  if [ "${CALCULATED_SUM}" = "${EXPECTED_SUM}" ]; then
+    juju-log "Checksum verified for ${FILE}."
+    return 0
+  else
+    status-set blocked "ibm-base: checksums did not match"
+    juju-log "Checksum mismatch for ${FILE}. Expected ${EXPECTED_SUM}, got ${CALCULATED_SUM}"
+    return 1
+  fi
+}
+
+
+# Fetch curl resources if a URL is configured
+@when 'config.set.curl_url'
+@when_any 'config.new.curl_url' 'config.changed.curl_url' 'config.new.curl_opts' 'config.changed.curl_opts'
+function fetch_curl_resource() {
+  local ARCHIVE_DIR="${CHARM_DIR}/files/archives"
+  local CURL_URL=$(config-get 'curl_url')
+  local CURL_OPTS=$(config-get 'curl_opts')
+
+  status-set maintenance "ibm-base: fetching resource(s)"
+
+  mkdir -p ${ARCHIVE_DIR}
+  cd ${ARCHIVE_DIR}
+  # Multiple URLs may be separated by a space, so loop.
+  for URL_STRING in ${CURL_URL}
+  do
+    # For each URL_STRING, set the url, checksum type, and checksum value.
+    local URL=${URL_STRING%%\?*}        # string before the first '?'
+    local FILE_NAME=${URL##*\/}         # string after the last '/'
+    local SUM_STRING=${URL_STRING#*\?}  # string after the first '?'
+    local SUM_TYPE=${SUM_STRING%%\=*}   # string before the first '='
+    local SUM_VALUE=${SUM_STRING#*\=}   # string after the first '='
+
+    if [ -z ${FILE_NAME} ]; then
+      FILE_NAME="juju-${RANDOM}"
+    fi
+    curl --silent --show-error ${CURL_OPTS} -o ${FILE_NAME} ${URL}
+
+    # Verify our resource checksum. If this fails, let verify_resource log
+    # the reason and exit successfully. Exiting non-zero would fail the hook,
+    # so return 0 and simply inform the user that verification failed.
+    verify_curl_resource ${FILE_NAME} ${SUM_TYPE} ${SUM_VALUE} || return 0
+  done
+  cd -
+
+  set_state 'ibm-base.curl.resource.fetched'
+  status-set active "ibm-base: curl resource(s) fetched"
+  juju-log 'Curl resource fetched'
+}
+
+
+# Handle license acceptance
+@when 'config.changed.license_accepted'
+function check_license_acceptance() {
+  local LIC_ACCEPTED=$(config-get 'license_accepted')
+
+  # compare lowercase LIC_ACCEPTED (requires bash > 4)
+  if [ "${LIC_ACCEPTED,,}" = "true" ]; then
+    set_state 'ibm-base.license.accepted'
+    juju-log 'License accepted'
+  else
+    remove_state 'ibm-base.license.accepted'
+    juju-log 'License NOT accepted'
+  fi
+}
+
+# Main reactive entry point
+reactive_handler_main
 
=== added file 'reactive/ibm-mq.sh'
--- reactive/ibm-mq.sh	1970-01-01 00:00:00 +0000
+++ reactive/ibm-mq.sh	2017-02-15 08:51:47 +0000
@@ -0,0 +1,340 @@
+#!/bin/bash
+
+set -ex
+source charms.reactive.sh
+
+ARCHIVE_DIR=$CHARM_DIR/files/archives
+MQ_INSTALL_PATH=/opt/mqm
+ARCHITECTURE=`uname -m`
+RPM_INSTALL_ARG="-ivh --nodeps --force-debian"
+relatedService=""
+QMA=""
+QM_Name=""
+hostname=`unit-get private-address`
+	if [ "$ARCHITECTURE" = "ppc64le" ]; then
+	RPM_INSTALL_ARG="-ivh --nodeps --force-debian --ignorearch"
+	fi
+
+
+# Check whether IBM MQ is installed
+
+is_mq_installed()
+{
+	if [ -d $MQ_INSTALL_PATH/bin ]; then
+	source $MQ_INSTALL_PATH/bin/setmqenv -s
+		if [ $? == 0 ]; then
+		source $MQ_INSTALL_PATH/bin/setmqenv -s
+		echo "True"
+		fi
+	else
+	echo "False"
+	fi
+}
+
+# Remove MQ, if installed
+remove_software()
+{
+
+	mq_installed=`is_mq_installed`
+	if  [ $mq_installed == True ]; then
+		juju-log "Removing IBM MQ software."
+		# Stop all queues
+		questr="QMNAME("
+		for queue in `$MQ_INSTALL_PATH/bin/dspmq -o installation | cut -d' ' -f1 `; 
+		do
+			# Get the queue manager name 
+			queue_mgr_name=${queue:${#questr}:${#queue}-${#questr}-1}
+			juju-log "Stopping queue manager $queue_mgr_name"
+			set +e
+			su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqm -w $queue_mgr_name"
+			su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqlsr -w -m $queue_mgr_name"
+			set -e
+		done
+		# Get list of packages and remove them
+		mq_rpms="`rpm -qa | grep MQSeries`"
+		juju-log "Removing package(s) $mq_rpms"
+		rpm -ev --force-debian $mq_rpms 
+	fi
+
+}
+
+# Update system configuration after installing MQ
+configure_system()
+{
+	juju-log "IBM MQ: Updating system configuration."
+	# Some containers do not allow system updates.
+	# Prevent the script from failing in such cases
+	set +e
+
+	# Add user ubuntu to mqm group
+	adduser ubuntu mqm
+
+	# Update mqm file limits
+
+	hard_nf=`su - mqm -c "ulimit -Hn"`
+	soft_nf=`su - mqm -c "ulimit -Sn"`
+
+	if [ $hard_nf -lt 10240 -o $soft_nf -lt 10240 ]; then
+		if [ "`grep mqm  /etc/security/limits.conf`"=="" ]; then
+			sed -i 's/# End of file/mqm              hard    nofile          10240\nmqm              soft    nofile          10240\n# End of file/' /etc/security/limits.conf
+		fi
+		#Update /etc/pam.d/common-session file to take effect the above changes
+		result_search=`grep 'session required pam_limits.so' /etc/pam.d/common-session`
+		if [ -z "$result_search" ]; then
+			sed -i 's/# end of pam-auth-update config/session required pam_limits.so\n# end of pam-auth-update config/' /etc/pam.d/common-session
+		fi
+	fi
+
+	set -e
+	juju-log "IBM MQ: Completed system configuration update."
+
+}
+
+# create Queue manager and Queue 
+create_QM_Queue()
+{
+
+	juju-log "IBM MQ: Verifying installation."
+
+	relatedService=$1
+	consumer_hostname=$2
+
+	QMA="${relatedService//-}.queue.manager"
+
+	# Prevent the script from failing on failure. 
+	# It could because configure_system call failed
+	set +e
+
+	# Run as mqm user as root will not work
+
+	# Create queue manager
+	juju-log "IBM MQ: Create queue manager $QMA."
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/crtmqm $QMA"
+	rc=$?
+	if [ $rc == 0 ]; then
+		juju-log "IBM MQ: queue manager $QMA created."
+		QM_create=1
+	elif [ $rc == 8 ]; then
+		QM_exists=1
+	else
+		juju-log "IBM MQ: Failed to create queue manager $QMA."
+	fi
+
+	# Start queue manager
+	if [ $QM_create -eq 1 ]; then
+		juju-log "IBM MQ: Starting queue manager $QMA."
+		su -l mqm -c "$MQ_INSTALL_PATH/bin/strmqm $QMA"
+		if [ $? == 0 ]; then
+			juju-log "IBM MQ: Queue manager $QMA started."
+		else
+			juju-log "IBM MQ: Failed to start queue manager $QMA."
+	
+		fi
+	
+		# set the port to listen queue manager
+		new_port=1414
+		free_port=0
+		is_free=0
+	
+		#Check whether the port number is already in use
+		while [ $free_port -eq 0 ]
+		do
+	
+			#is_free=`netstat -lnp | grep $new_port | cut -d":" -f2 | cut -d" " -f1`
+			is_free=`netstat -an | grep $new_port | grep LISTEN`
+			if [ -z "$is_free" ]; then
+				free_port=1
+			else
+				new_port=$((new_port+1))
+			fi
+	
+		done
+
+		juju-log "IBM MQ: Setting port to $new_port"
+	
+		#start queue manager in listener mode
+		juju-log "IBM MQ: Starting queue manager $QMA in listener mode"
+		su -l mqm -c "$MQ_INSTALL_PATH/bin/runmqlsr -m $QMA -t tcp -p $new_port" &
+		if [ $? == 0 ]; then
+			juju-log "IBM MQ: Queue manager $QMA listening on $new_port"
+		else
+			juju-log "IBM MQ: Queue manager $QMA failed to listen"
+		fi
+
+		# Create queue and setup the queue configuration for consumer service 
+		juju-log "IBM MQ: Creating queue."
+
+		sudo bash -c "cat > $CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc << EOF
+DEFINE QLOCAL (QUEUE1)
+DEFINE CHANNEL ('MDB.SVRCONN') CHLTYPE(SVRCONN) TRPTYPE(TCP)
+SET CHLAUTH ('MDB.SVRCONN') TYPE(ADDRESSMAP) ADDRESS($consumer_hostname) MCAUSER('mqm')
+SET AUTHREC OBJTYPE(QMGR) PRINCIPAL('mqm') AUTHADD(CONNECT,INQ)
+SET AUTHREC PROFILE('QUEUE1') OBJTYPE(QUEUE) PRINCIPAL('mqm') AUTHADD(PUT,GET,INQ,BROWSE)
+SET AUTHREC PROFILE('SYSTEM.BASE.TOPIC') OBJTYPE(TOPIC) PRINCIPAL('mqm') AUTHADD(PUB, SUB)
+EOF"
+		if [ $? == 0 ]; then
+			# Create file to delete the above queue when relation breaks
+			sudo bash -c "echo 'DELETE QLOCAL(QUEUE1) PURGE' > $CHARM_DIR/files/archives/${relatedService//-}_mq_delete_queue.mqsc"
+		fi
+
+		if [ -f $CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc ]; then
+
+			su -l mqm -c "$MQ_INSTALL_PATH/bin/runmqsc $QMA < $CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc"
+			if [ $? == 0 ]; then
+				juju-log "IBM MQ: Queue created."
+			else
+				juju-log "IBM MQ: Failed to create queue."
+			fi
+
+			QM_Name=$QMA
+			Qname=$CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc
+			port=$new_port
+			open-port $port/TCP
+
+			juju-log "create_QM_Queue values are QM_name=$QM_Name Qname=$Qname hostname=$hostname port=$port"
+		fi
+	elif [ $QM_exists -eq 1 ];then
+		QM_Name=$QMA
+		Qname=$CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc
+		port=`ps -ef| grep runmqlsr | grep "$QMA" | grep -v grep | grep "su -l mqm" | awk -F"-p " '{print $2}'`
+		juju-log "relation with ${relatedService} already exists"
+		juju-log "create_QM_Queue values are QM_name=$QM_Name Qname=$Qname hostname=$hostname port=$port"
+	fi
+
+}
+
+
+# IBM MQ: Deleting queue	
+delete_QM_Queue()
+{
+
+	relatedService=$1
+
+	QMA="${relatedService//-}.queue.manager"
+	# Delete queue
+	juju-log "IBM MQ: Deleting queue."
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/runmqsc $QMA < $CHARM_DIR/files/archives/${relatedService//-}_mq_delete_queue.mqsc"
+	if [ $? == 0 ]; then
+		juju-log "IBM MQ: Deleted queue."
+	else
+		juju-log "IBM MQ: Failed to delete queue."
+	fi
+	
+
+	port=`ps -ef| grep runmqlsr | grep "$QMA" | grep -v grep | grep "su -l mqm" | awk -F"-p " '{print $2}'`
+
+	juju-log "IBM MQ: stop Queue manager from listening on port"
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqlsr -m $QMA -w"
+	if [ $? == 0 ]; then
+                juju-log "IBM MQ: Stopped queue manager from listening."
+        else
+                juju-log "IBM MQ: Failed to stop queue manager to listen."
+        fi
+
+	#close-port the open-port for the consumer
+	close-port $port
+	
+	# End queue manger
+	juju-log "IBM MQ: Stopping queue manager."
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqm $QMA"
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/endmqlsr -w -m  $QMA"
+	if [ $? -eq 0 ]; then
+		juju-log "IBM MQ: Queue Manager is stopped."
+	else
+		juju-log "IBM MQ: Queue Manager failed to stop."
+	fi
+
+	sleep 10
+
+	juju-log "IBM MQ: Deleting queue manager."
+	su -l mqm -c "$MQ_INSTALL_PATH/bin/dltmqm $QMA"
+	if [ $? -eq 0 ]; then
+		juju-log "IBM MQ: Queue Manager is deleted."
+	else
+		juju-log "IBM MQ: Queue Manager could not be deleted."
+	fi
+
+	#clean up the created MQSC files
+	if [ -f $CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc ];then
+		sudo bash -c "rm $CHARM_DIR/files/archives/${relatedService//-}_mq_create_queue.mqsc"
+	fi
+	if [ -f $CHARM_DIR/files/archives/${relatedService//-}_mq_delete_queue.mqsc ]; then
+		sudo bash -c "rm $CHARM_DIR/files/archives/${relatedService//-}_mq_delete_queue.mqsc"
+	fi
+
+	set -e
+	juju-log "IBM MQ: Deleting queue completed."
+}
+
+@when 'ibm-base.license.accepted' 'ibm-base.curl.resource.fetched'
+@when_not 'ibm-mq.installed'
+function mq_install() {
+	juju-log "inside mq install function."
+	mq_inst=`is_mq_installed`
+	juju-log "mq_inst==$mq_inst"
+	if [ -f  $CHARM_DIR/files/archives/*.gz  ]; then
+		juju-log "IBM MQ: Extracting IBM MQ package."
+		tar xvfz $CHARM_DIR/files/archives/*.gz  --strip-components=1 -C $CHARM_DIR/files/archives 
+		rm -rf  $CHARM_DIR/files/archives/*.gz
+		juju-log "IBM MQ: Extracted IBM MQ package."
+		juju-log "Awaiting acceptance of IBM MQ license (see README on how to accept the license)."
+	fi
+	if  [ $mq_inst == False ]; then
+	# Check MQ package availability
+		if [ -f  $CHARM_DIR/files/archives/MQSeriesServer*rpm ] && [ -f  $CHARM_DIR/files/archives/MQSeriesRuntime*rpm ]; 
+		then 
+			echo "MQ Packages available for installation."; 
+			$CHARM_DIR/files/archives/mqlicense.sh -accept
+			juju-log "Installing available MQ packages."
+			rpm $RPM_INSTALL_ARG --prefix $MQ_INSTALL_PATH $CHARM_DIR/files/archives/MQSeries*rpm
+			juju-log "Installation of available MQ packages complete."
+			# Configure system values  for MQ
+			configure_system
+			set_state 'ibm-mq.installed'
+			status-set active "MQ installed successfully"
+		else 
+			status-set blocked "MQ Packages missing. Please check README file Upgrade MQ charm after adding the MQ packages"
+		fi
+	fi
+}
+
+@when 'ibm-mq.installed'
+@when 'messaging.connected'
+function export_mq_details(){
+	juju-log "on ibm_mq.connected triggered here"
+	services=$(relation_call --state=messaging.connected services) || true
+	for service in $services; do
+		juju-log "$service"
+		consumer_hostname=$(relation_call --state=messaging.connected get_consumer_hostname) || true
+		create_QM_Queue $service $consumer_hostname
+		juju-log "create_QM_Queue values are QM_name=$QM_Name Qname=$Qname hostname=$hostname port=$port"
+		relation_call --state=messaging.connected set_mq_details $service $QM_Name $Qname $hostname $port || true
+	done
+}
+
+@when 'messaging.departed' 'ibm-mq.installed'
+function remove_mq_QM_Q() {
+	juju-log "in delete_QM_Queue.."
+	services=$(relation_call --state=messaging.departed services) || true
+	for service in $services; do
+		juju-log "$service"
+		delete_QM_Queue $service
+		juju-log "delete_QM_Queue done."
+		juju-log "Calling dismiss for $service"
+		relation_call --state=messaging.departed dismiss $service || true
+	done
+ }
+
+@when 'ibm-mq.installed'
+@when_not 'ibm-base.license.accepted'
+function uninstall() {
+	# Uninstall all versions of IBM MQ
+	status-set maintenance "Uninstalling IBM MQ"
+	mq_license_accepted=`config-get accept-ibm-mq-license`
+	remove_software 
+	remove_state 'ibm-mq.installed'
+	remove_state 'messaging.connected'
+	status-set blocked "IBM MQ Uninstalled"
+}
+
+reactive_handler_main
 
=== added file 'reactive/leadership.py'
--- reactive/leadership.py	1970-01-01 00:00:00 +0000
+++ reactive/leadership.py	2017-02-15 08:51:47 +0000
@@ -0,0 +1,68 @@
+# Copyright 2015-2016 Canonical Ltd.
+#
+# This file is part of the Leadership Layer for Juju.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from charmhelpers.core import hookenv
+from charmhelpers.core import unitdata
+
+from charms import reactive
+from charms.leadership import leader_get, leader_set
+
+
+__all__ = ['leader_get', 'leader_set']  # Backwards compatibility
+
+
+def initialize_leadership_state():
+    '''Initialize leadership.* states from the hook environment.
+
+    Invoked by hookenv.atstart() so states are available in
+    @hook decorated handlers.
+    '''
+    is_leader = hookenv.is_leader()
+    if is_leader:
+        hookenv.log('Initializing Leadership Layer (is leader)')
+    else:
+        hookenv.log('Initializing Leadership Layer (is follower)')
+
+    reactive.helpers.toggle_state('leadership.is_leader', is_leader)
+
+    previous = unitdata.kv().getrange('leadership.settings.', strip=True)
+    current = hookenv.leader_get()
+
+    # Handle deletions.
+    for key in set(previous.keys()) - set(current.keys()):
+        current[key] = None
+
+    any_changed = False
+    for key, value in current.items():
+        reactive.helpers.toggle_state('leadership.changed.{}'.format(key),
+                                      value != previous.get(key))
+        if value != previous.get(key):
+            any_changed = True
+        reactive.helpers.toggle_state('leadership.set.{}'.format(key),
+                                      value is not None)
+    reactive.helpers.toggle_state('leadership.changed', any_changed)
+
+    unitdata.kv().update(current, prefix='leadership.settings.')
+
+
+# Per https://github.com/juju-solutions/charms.reactive/issues/33,
+# this module may be imported multiple times so ensure the
+# initialization hook is only registered once. I have to piggy back
+# onto the namespace of a module imported before reactive discovery
+# to do this.
+if not hasattr(reactive, '_leadership_registered'):
+    hookenv.atstart(initialize_leadership_state)
+    reactive._leadership_registered = True
 
=== added file 'reactive/test'
--- reactive/test	1970-01-01 00:00:00 +0000
+++ reactive/test	2017-02-15 08:51:47 +0000
@@ -0,0 +1,1 @@
+DEFINE QLOCAL (QUEUE1)
 
=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2017-02-15 08:51:47 +0000
@@ -0,0 +1,2 @@
+flake8
+pytest
 
=== modified file 'revision'
--- revision	2015-03-11 19:52:30 +0000
+++ revision	2017-02-15 08:51:47 +0000
@@ -1,1 +1,1 @@
-1
+1
 \ No newline at end of file
 
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-06-10 10:41:46 +0000
+++ tests/00-setup	2017-02-15 08:51:47 +0000
@@ -1,5 +1,17 @@
 #!/bin/bash
+MQ_CURL_URL=${MQ_CURL_URL?Error: IBM MQ  curl_url be defined in tests/00-setup}
+MQ_CURL_OPTS=${MQ_CURL_OPTS?Error: IBM MQ  curl_OPTS be defined in tests/00-setup}
+MQ_LICENSE=${MQ_LICENSE?Error: IBM MQ License accepted value must be defined in tests/00-setup}
+
+# Add a local configuration file
+cat << EOF > local.yaml
+mq:
+    mq_curl_url: "$MQ_CURL_URL"
+    mq_curl_opts: "$MQ_CURL_OPTS"
+    mq_license_accepted: "$MQ_LICENSE"
+EOF
 
 sudo add-apt-repository ppa:juju/stable -y
 sudo apt-get update
-sudo apt-get install amulet -y
+sudo apt-get -y install unzip
+sudo apt-get install amulet python3 -y
 
=== modified file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2015-07-15 08:13:51 +0000
+++ tests/10-bundles-test.py	2017-02-15 08:51:47 +0000
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
-
 # This amulet test deploys the bundles.yaml file in this directory.
 
 import os
 import unittest
 import yaml
 import amulet
+import sys
 
 # Lots of prereqs on this charm (eg: java), so give it a large timeout
 seconds_to_wait = 1500
@@ -16,14 +16,41 @@
     @classmethod
     def setUpClass(cls):
         """ Set up an amulet deployment using the bundle. """
-        d = amulet.Deployment()
-        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
-        with open(bundle_path, 'r') as bundle_file:
-            contents = yaml.safe_load(bundle_file)
-            d.load(contents)
+        d = amulet.Deployment(juju_env='local', series='trusty')
+        local_path = os.path.join(os.path.dirname(__file__), 'local.yaml')
+        with open(local_path, "r") as fd:
+            config = yaml.safe_load(fd)
+        curl_url = config.get('mq').get('mq_curl_url')
+        print('Using mq_curl_url  %s' % curl_url)
+        # Test if a IBM mq curl url is defined
+        if not curl_url:
+            print("You need to define a im_curl_url.\n"
+                  "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+
+        curl_opts = config.get('mq').get('mq_curl_opts')
+        print('Using mq_curl_opts  %s' % curl_opts)
+        # Test if IBM  curl_opts is defined
+        if not curl_opts:
+            print("You need to define a curl_opts."
+                  " repository.\n Edit local.yaml or tests/00-setup"
+                  " and run it again.")
+            sys.exit(1)
+        license_accepted = config.get('mq').get('mq_license_accepted')
+        print('Using license_accepted  %s' % license_accepted)
+        # Test if a license_accepted is defined
+        if not license_accepted:
+            print("You need to define a license_accepted for the IBM MQ"
+                  " product repository.\n Edit local.yaml or tests/00-setup"
+                  " and run it again.")
+            sys.exit(1)
+
+        d.add('ibm-mq')
 
         # Software doesn't actually install until you accept the license
-        d.configure('ibm-mq', {'accept-ibm-mq-license': True})
+        d.configure('ibm-mq', {'license_accepted': license_accepted,
+                               'curl_url': curl_url,
+                               'curl_opts': curl_opts})
 
         d.setup(seconds_to_wait)
         d.sentry.wait(seconds_to_wait)
@@ -34,22 +61,26 @@
         self.assertTrue(self.d.deployed)
 
     def test_running(self):
-        """ Test that, if deployed, everything is set up and running correctly. """
-        ibm_mq_unit = self.d.sentry.unit['ibm-mq/0']
+        """ Test that, if deployed,
+            everything is set up and running correctly. """
+        ibm_mq_unit = self.d.sentry.unit['ibm-mq'][0]
 
         # Configure system values
         output, code = ibm_mq_unit.run('sysctl kernel.shmmax | cut -d= -f2')
         print(output)
         if code != 0 or int(output) < 268435456:
-            # this isn't really a pass/fail test, as it depends on the environment
-            # to which the charm is deployed, and doesn't block the install
-            print('Unable to set kernel.shmmax value (perhaps on local provider?).')
+            # this isn't really a pass/fail test, as it depends
+            # on the environment to which
+            # the charm is deployed, and doesn't block the install
+            print('Unable to set kernel.shmmax'
+                  ' value (perhaps on local provider?).')
 
         output, code = ibm_mq_unit.run('sysctl fs.file-max | cut -d= -f2')
         print(output)
         if code != 0 or int(output) < 524288:
-            # this isn't really a pass/fail test, as it depends on the environment
-            # to which the charm is deployed, and doesn't block the install
+            # this isn't really a pass/fail test, as it depends
+            # on the environment to which
+            # the charm is deployed, and doesn't block the install
             print('Unable to set fs.file value (perhaps on local provider?).')
 
         output, code = ibm_mq_unit.run('sysctl -p')
 
=== removed file 'tests/bundles.yaml'
--- tests/bundles.yaml	2015-07-09 18:38:01 +0000
+++ tests/bundles.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-ibm-mq-liberty-bundle: 
-  services: 
-    "ibm-mq": 
-      charm: "ibm-mq"
-      num_units: 1
-      annotations: 
-        "gui-x": "300"
-        "gui-y": "300"
-  relations: []
-  series: trusty
 
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2017-02-15 08:51:47 +0000
@@ -0,0 +1,12 @@
+[tox]
+skipsdist=True
+envlist = py34, py35
+skip_missing_interpreters = True
+
+[testenv]
+commands = py.test -v
+deps =
+    -r{toxinidir}/requirements.txt
+
+[flake8]
+exclude=docs
 
=== added directory 'wheelhouse'
=== added file 'wheelhouse/Jinja2-2.8.tar.gz'
 Binary files wheelhouse/Jinja2-2.8.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/Jinja2-2.8.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/MarkupSafe-0.23.tar.gz'
 Binary files wheelhouse/MarkupSafe-0.23.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/MarkupSafe-0.23.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/PyYAML-3.12.tar.gz'
 Binary files wheelhouse/PyYAML-3.12.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/PyYAML-3.12.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/Tempita-0.5.2.tar.gz'
 Binary files wheelhouse/Tempita-0.5.2.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/Tempita-0.5.2.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/charmhelpers-0.9.1.tar.gz'
 Binary files wheelhouse/charmhelpers-0.9.1.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charmhelpers-0.9.1.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/charms.reactive-0.4.5.tar.gz'
 Binary files wheelhouse/charms.reactive-0.4.5.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charms.reactive-0.4.5.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/netaddr-0.7.18.tar.gz'
 Binary files wheelhouse/netaddr-0.7.18.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/netaddr-0.7.18.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/pip-8.1.2.tar.gz'
 Binary files wheelhouse/pip-8.1.2.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/pip-8.1.2.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/pyaml-16.9.0.tar.gz'
 Binary files wheelhouse/pyaml-16.9.0.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/pyaml-16.9.0.tar.gz	2017-02-15 08:51:47 +0000 differ
=== added file 'wheelhouse/six-1.10.0.tar.gz'
 Binary files wheelhouse/six-1.10.0.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/six-1.10.0.tar.gz	2017-02-15 08:51:47 +0000 differ