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

[Suchitra Venugopal]

Code changes for DB2 Layered charm

Updates for Layered DB2 charm.

Deployable charm can be fond in the
Repo : https://code.launchpad.net/~ibmcharmers/charms/trusty/ibm-db2/trunk

And, its source code can be found in the below repository
Repo : https://code.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-db2/trunk

The charm has been pushed into charm store as well
branch : cs:~ibmcharmers/trusty/ibm-db2-31

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/4102/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4116/

review: Needs Fixing (automated testing)

[Cory Johns (johnsca)]

Overall this looks good. I encountered a couple of small rough edges from the ibm-base layer, which can be addressed there. But I did notice that the ibm-db2.client.sshconfigured state is not set per-consumer; once any consumer sends SSH keys, all consumers will assume that keys have been sent, and once any one consumer departs, all consumers will be blocked even if they previously sent SSH keys. I don't know if that was intended, but it seems like that state should be set by the interface layer instead, such as in the dismiss() method.

[Suchitra Venugopal (suchvenu)]

> Overall this looks good. I encountered a couple of small rough edges from the
> ibm-base layer, which can be addressed there. But I did notice that the ibm-
> db2.client.sshconfigured state is not set per-consumer; once any consumer
> sends SSH keys, all consumers will assume that keys have been sent, and once
> any one consumer departs, all consumers will be blocked even if they
> previously sent SSH keys. I don't know if that was intended, but it seems
> like that state should be set by the interface layer instead, such as in the
> dismiss() method.

Hi Cory,
 I have done the changes as per your suggestions. Please review once and let me know.

Thanks,
 Suchitra

[Kevin W Monroe (kwmonroe)]

Hi Suchitra - to be compatible with recent changes in the db2 interface layer [0], I updated layer-ibm-db2 source so it uses the 'db.connected' state instead of 'db.available'. There is no need to have both states in the interface, so I removed references to the undocumented 'available' state.

The resultant ibm-db2 charms seems ok to me, but I would like you to verify this still works as expected for you. A charm based on these changes is available here:

https://jujucharms.com/u/ibmcharmers/ibm-db2/trusty/35

And can be deployed with:

juju deploy cs:~ibmcharmers/trusty/ibm-db2-35

Please let me know if this works as expected for you. If all is ok, we'll promulgate v35. Thanks!!

[0] - http://bazaar.launchpad.net/~ibmcharmers/interface-ibm-db2/trunk/revision/5

review: Needs Information

[Kevin W Monroe (kwmonroe)]

A diff of the changes from my comment above can be found here:

http://bazaar.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-db2/trunk/revision/10

Apologies for including lint fixes there; you can find relevant changes by searching for 'db.connected' in that diff.

[Kevin W Monroe (kwmonroe)]

I made a mistake in the ssh_key handler in the interface, which has now been fixed. A new version of ibm-db2 for test is available here:

juju deploy cs:~ibmcharmers/trusty/ibm-db2-36

[Suchitra Venugopal (suchvenu)]

Charm is tested with the changes. Few minor changes are done to handle the states properly.

[Suchitra Venugopal (suchvenu)]

The new version is available here :
cs:~ibmcharmers/trusty/ibm-db2-37

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

62. By Suchitra Venugopal on 2016-07-04

DB2 stopping the apps before db2stop

[Kevin W Monroe (kwmonroe)]

Hi Suchitra, I made quite a few tweaks to the layered source:

http://bazaar.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-db2/trunk/revision/20?compare_revid=15

Some are cosmetic, others are bash-ism tweaks (like comparing strings with == and integers with -eq). The most significant, however, is in the password handling of db2 users.

I didn't realize before that the db2inst1, dasusr1, db2fenc1, and the users for related units all had default passwords. This isn't acceptable for applications providing network services, so I updated this charm to use the 'pwgen' utility to create random passwords for these users.

Have a look at the above diff, which is available for deployment at:

cs:~ibmcharmers/trusty/ibm-db2-39

If you're ok with these changes, we can (finally) promulgate v39 :)

Thanks!
-Kevin

[Kevin W Monroe (kwmonroe)]

There was a bug in the leadership layer [0] that would cause the config.set.x states to be reset after the 'leader-elected' hook was run. This caused the db2 charm to report blocked even after installation because it thought license.accepted was no longer set.

This has been fixed in cs:~ibmcharmers/trusty/ibm-db2-41

We'll need the MP in [0] to be merged before officially promoting v41. Hopefully that will happen in the next few hours.

[0] https://code.launchpad.net/~kwmonroe/layer-leadership/+git/layer-leadership/+merge/299986

[Suchitra Venugopal (suchvenu)]

 I just removed the 2 functions you added for missing license and curl config , to check whether everything else is working fine.

1. DB2 gets installed but shows the state as

ibm-db2:
    charm: local:trusty/ibm-db2-15
    exposed: false
    service-status:
      current: maintenance
      message: Installing binutils,curl,pwgen,tar
      since: 14 Jul 2016 09:37:15+05:30
    units:
      ibm-db2/14:
        workload-status:
          current: maintenance
          message: Installing binutils,curl,pwgen,tar
          since: 14 Jul 2016 09:37:15+05:30
        agent-status:
          current: idle
          since: 14 Jul 2016 10:07:49+05:30
          version: 1.25.5.1
        agent-state: started
        agent-version: 1.25.5.1
        machine: "49"
        public-address: 10.0.3.141

The status history shows like this :

charm@islrpbeixv665:~/charms/trusty$ juju status-history ibm-db2/14 -n 1000
TIME TYPE STATUS MESSAGE
14 Jul 2016 09:21:59+05:30 workload unknown Waiting for agent initialization to finish
14 Jul 2016 09:21:59+05:30 agent allocating
14 Jul 2016 09:24:51+05:30 workload maintenance installing charm software
14 Jul 2016 09:24:52+05:30 agent executing running install hook
14 Jul 2016 09:26:24+05:30 workload maintenance ibm-base: fetching resource(s)
14 Jul 2016 09:34:38+05:30 workload active ibm-base: curl resource(s) fetched
14 Jul 2016 09:34:39+05:30 workload maintenance Installing pre requisites for IBM DB2
14 Jul 2016 09:34:51+05:30 workload maintenance Installed pre requisites for IBM DB2
14 Jul 2016 09:34:51+05:30 workload maintenance Updating apt cache
14 Jul 2016 09:35:25+05:30 workload maintenance Installing IBM DB2
14 Jul 2016 09:37:15+05:30 workload active IBM DB2 Installed
14 Jul 2016 09:37:15+05:30 workload maintenance Installing binutils,curl,pwgen,tar
14 Jul 2016 09:37:15+05:30 workload maintenance Installing binutils,curl,pwgen,tar
14 Jul 2016 09:37:20+05:30 agent executing running leader-elected hook
14 Jul 2016 09:37:23+05:30 agent executing running config-changed hook
14 Jul 2016 09:37:26+05:30 agent executing running start hook
14 Jul 2016 09:37:28+05:30 agent executing running update-status hook
14 Jul 2016 09:37:33+05:30 agent idle
14 Jul 2016 09:42:31+05:30 agent executing running update-status hook
14 Jul 2016 09:42:36+05:30 agent idle
14 Jul 2016 09:47:34+05:30 agent executing running update-status hook
14 Jul 2016 09:47:39+05:30 agent idle
14 Jul 2016 09:52:37+05:30 agent executing running update-status hook
14 Jul 2016 09:52:42+05:30 agent idle
14 Jul 2016 09:57:40+05:30 agent executing running update-status hook
14 Jul 2016 09:57:44+05:30 agent idle
14 Jul 2016 10:02:42+05:30 agent ...

[Suchitra Venugopal (suchvenu)]

Getting this issue related to removing SSH Key

I am getting the following error in the log:
mmzo2djFG9xK7LduQURBTsY11JyShxQElPlHPm+z9WQEWH+JmcAQ2cjJDztlCayspGj94JzWqqf2FKiEkaIds9RlGPWnkz28LRjAwyFpw5bJmn7ACDVrhes63vMvyx1P5WtnykS2aQJAv6drmDfGcGvdNHdnC9lN/v4wB4k9JLw6eE38JASa4eIzpIb5t0qOYmQ71e5FDQPHxYHlBwRI27UHee72bdO97b7VGVE12x8cFzEx2fm6Ad244fvdP24z3D+KnDXoeupBC6TTZgav3/QsnxmG/WWqzyPYZloln4oVfAxYDvmKdTD5WERj7d3lruUP1 Juju:juju-system-key
2016-07-14 08:41:56 INFO stop mv: cannot stat 'tempfile.txt': No such file or directory
2016-07-14 08:41:56 INFO stop Traceback (most recent call last):
2016-07-14 08:41:56 INFO stop File "/var/lib/juju/agents/unit-ibm-db2-19/charm/hooks/stop", line 19, in <module>
2016-07-14 08:41:56 INFO stop main()
2016-07-14 08:41:56 INFO stop File "/usr/local/lib/python3.4/dist-packages/charms/reactive/__init__.py", line 78, in main
2

I revert back the change you did for remove_sshkeys() function and its working fine.
What was the reason for this change ? I tried testing with 2 consumers and it looks fine for me, while removing the relation between DB2 and this consumer.

[Suchitra Venugopal (suchvenu)]

Done the following changes with combined effort from Kevin and myself.

1. Issue related to unordered status fixed.
2. SSH key issue - reverted back the code changes related to this.
3. Updated README file with DB2 limitations

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

63. By Kevin W Monroe on 2016-07-14

new build of layered db2 charm (source lives in lp:~ibmcharmers/charms/trusty/layer-ibm-db2/trunk)

[Kevin W Monroe (kwmonroe)]

This has been a long time coming, but it looks good :) The layered ibm-db2 charm is now promulgated (https://jujucharms.com/ibm-db2/) and can be deployed with:

juju deploy ibm-db2

Thanks for the patience and work to get this charm into a recommended state!

review: Approve

[Cory Johns (johnsca)]

Changed status to Merged to drop off queue

=== added file '.build.manifest'
--- .build.manifest	1970-01-01 00:00:00 +0000
+++ .build.manifest	2016-07-14 17:53:24 +0000
@@ -0,0 +1,298 @@
+{
+  "layers": [
+    "layer:ibm-base", 
+    "layer:basic", 
+    "layer:apt", 
+    "layer:leadership", 
+    "ibm-db2", 
+    "interface:db2", 
+    "build"
+  ], 
+  "signatures": {
+    "bin/layer_option": [
+      "layer:basic", 
+      "static", 
+      "621b556cd208005e131e9f648859294347da9376609745a73ca2e808dd2032f9"
+    ], 
+    "hooks/leader-settings-changed": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "wheelhouse/pyaml-15.8.2.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "9c54fb5f17b58572c4cef50affea60bb73f445ab153580dac07a12383712b5b8"
+    ], 
+    "lib/charms/layer/execd.py": [
+      "layer:basic", 
+      "static", 
+      "c0eb4c90e93a14f04d851f78bc6592e093226321fbe328125958633397aed014"
+    ], 
+    "hooks/leader-elected": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "Makefile": [
+      "layer:basic", 
+      "static", 
+      "b7ab3a34e5faf79b96a8632039a0ad0aa87f2a9b5f0ba604e007cafb22190301"
+    ], 
+    "reactive/__init__.py": [
+      "layer:leadership", 
+      "static", 
+      "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    ], 
+    "tests/00-setup": [
+      "ibm-db2", 
+      "static", 
+      "0307887d397887fbf3f2f60b963535c455a2771615ae84c722b59a937c2185a3"
+    ], 
+    "reactive/ibm-db2.sh": [
+      "ibm-db2", 
+      "static", 
+      "d28f50f4c6e4441501665edb609b88836af7517b4a234f286b151f5c41b61acc"
+    ], 
+    ".build.manifest": [
+      "build", 
+      "dynamic", 
+      "unchecked"
+    ], 
+    "hooks/upgrade-charm": [
+      "layer:basic", 
+      "static", 
+      "8b9c153a61cc78067af8d016a8fa1c764caad3a40c82bb0b5121fc4c4c6a04f1"
+    ], 
+    "wheelhouse/charms.reactive-0.4.4.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "97455ce944a85adb2ceb897af81a1b93746f43527e6c4ac44798b193132158c7"
+    ], 
+    "wheelhouse/Tempita-0.5.2.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c"
+    ], 
+    "hooks/relations/db2/README.md": [
+      "interface:db2", 
+      "static", 
+      "200642c8fc5863827cd22d596b83b50be20205a6ecaebe7fd177fa52c1e16bb5"
+    ], 
+    "reactive/leadership.py": [
+      "layer:leadership", 
+      "static", 
+      "e2b233cf861adc3b2d9e9c062134ce2f104953f03283cdddd88f49efee652e8f"
+    ], 
+    "lib/charms/layer/basic.py": [
+      "layer:basic", 
+      "static", 
+      "d52423911fcef803a418025d355ac7c2e6729c2949c68aaf01bb3f8f24b67831"
+    ], 
+    "tox.ini": [
+      "layer:basic", 
+      "static", 
+      "00b57a776ac313e92a52daa05d1fdb6056c21b3105b643d32610fd937664321b"
+    ], 
+    "reactive/ibm-base.sh": [
+      "layer:ibm-base", 
+      "static", 
+      "d6251d7632d5cdd6fbc44db2478ab6ad1a392a1ed99867b28cff93b9402b2a1f"
+    ], 
+    "tests/bundles.yaml": [
+      "ibm-db2", 
+      "static", 
+      "1f2ad79c72a0c737e7d1e94b8047076a50fd33029100435c5d39fca46f1a4f81"
+    ], 
+    "copyright": [
+      "ibm-db2", 
+      "static", 
+      "600ba4f95fa249c78ea37dfcf870a1df35a0480509ca29bc221a80c6a7486711"
+    ], 
+    "hooks/install": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "lib/charms/leadership.py": [
+      "layer:leadership", 
+      "static", 
+      "12b52fa768c3e9072556ac6f46f68129dc762f89eb806d8dee921c86497f6707"
+    ], 
+    "requirements.txt": [
+      "layer:basic", 
+      "static", 
+      "0f1c70d27e26005a96d66ad54482877ae20f7737693c833e29dd72bd6ac24892"
+    ], 
+    "wheelhouse/netaddr-0.7.18.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "a1f5c9fcf75ac2579b9995c843dade33009543c04f218ff7c007b3c81695bd19"
+    ], 
+    ".gitignore": [
+      "layer:leadership", 
+      "static", 
+      "54c2eac10d7d0187b02c271ac7a3767bb3d365d562cfb8c1548efb4e84f7b2d5"
+    ], 
+    "files/archives/db2server_ppcle.rsp": [
+      "ibm-db2", 
+      "static", 
+      "31d1b67b7e5da6c86fcc44999b96b8520e10b4c93602691edc8e75910a0fe6cd"
+    ], 
+    "wheelhouse/MarkupSafe-0.23.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"
+    ], 
+    "hooks/relations/db2/interface.yaml": [
+      "interface:db2", 
+      "static", 
+      "70f0b2954e6e8ed4e08987d3eea6932cb7cd5d310dcad5ae28b50fd721631861"
+    ], 
+    "icon.svg": [
+      "ibm-db2", 
+      "static", 
+      "47984b36228e7500edb73a689797e0498babe9bc080573e0807bb3b4ece1b68d"
+    ], 
+    "config.yaml": [
+      "ibm-db2", 
+      "dynamic", 
+      "6a7919e3802ebd8de302cc661f5647a3d9211bdf253a7040d7db6bd64882be81"
+    ], 
+    "lib/charms/layer/__init__.py": [
+      "layer:basic", 
+      "static", 
+      "4ffd74384bd81d737572acf2d14fe55431eab8f49d6212d9aabedf24e1d992b2"
+    ], 
+    "hooks/stop": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "reactive/apt.py": [
+      "layer:apt", 
+      "static", 
+      "1d95f16ec99a5c7927b0b02c07ee7f174e51c80b2d64edc702b8d4352c70a258"
+    ], 
+    "hooks/relations/db2/provides.py": [
+      "interface:db2", 
+      "static", 
+      "472a72180fccde0197681815e3787bab0a0b3bd5d9b12f5f0bff21b77dedd5e7"
+    ], 
+    "hooks/hook.template": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "hooks/db-relation-joined": [
+      "interface:db2", 
+      "dynamic", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "wheelhouse/Jinja2-2.8.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4"
+    ], 
+    "hooks/db-relation-departed": [
+      "interface:db2", 
+      "dynamic", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "metadata.yaml": [
+      "ibm-db2", 
+      "dynamic", 
+      "99910e2c192e818b159d57f763fb422d23342bb6426c87ebc6c3a410c82c265b"
+    ], 
+    "wheelhouse/pip-8.1.2.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "4d24b03ffa67638a3fa931c09fd9e0273ffa904e95ebebe7d4b1a54c93d7b732"
+    ], 
+    "hooks/update-status": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "lib/charms/__init__.py": [
+      "layer:leadership", 
+      "static", 
+      "4032724b98ed267185b12b8ec78dd9bcb0423ab1c89a6f0dad99397fd51159d9"
+    ], 
+    "README.md": [
+      "ibm-db2", 
+      "static", 
+      "d2f0f64141542a8ea38b1f90ea0e6ef07128b5d642cc91b95940f8240e748f4a"
+    ], 
+    "hooks/start": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "hooks/db-relation-changed": [
+      "interface:db2", 
+      "dynamic", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "wheelhouse/PyYAML-3.11.zip": [
+      "layer:basic", 
+      "dynamic", 
+      "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"
+    ], 
+    "files/archives/db2server.rsp": [
+      "ibm-db2", 
+      "static", 
+      "708d2e38eab0fb470d4b7543566e3b5285ee49f6bdb53a684b7aa4ad267cc6bc"
+    ], 
+    "hooks/relations/db2/requires.py": [
+      "interface:db2", 
+      "static", 
+      "b21956a14a95ab341be8ba5e4b12e2d1a93a40db5f4743430e31a1dc15906da4"
+    ], 
+    "wheelhouse/charmhelpers-0.8.0.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "355c2632049621474c50cfee6a6f7014a863f6f3bac1134ed409479cbe99b102"
+    ], 
+    "layer.yaml": [
+      "ibm-db2", 
+      "dynamic", 
+      "a32ac0f8ad17673d793fed0188d0f42c92931991821fd4fe1bf175cbdbb54621"
+    ], 
+    "hooks/config-changed": [
+      "layer:basic", 
+      "static", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "tests/10-bundles-test.py": [
+      "ibm-db2", 
+      "static", 
+      "a37aaf266cd0d6b36cfa3f86b22a3169924e3a38eb9be3e161b0929fe5d43e71"
+    ], 
+    "hooks/relations/db2/__init__.py": [
+      "interface:db2", 
+      "static", 
+      "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    ], 
+    "hooks/db-relation-broken": [
+      "interface:db2", 
+      "dynamic", 
+      "3a854a5fd180c5bacbb80b501d968a8d8bdc1468361e7123ea4022a1e0363c9a"
+    ], 
+    "files/archives/db2inst1.INS": [
+      "ibm-db2", 
+      "static", 
+      "accbce657a8c0fbf5bcc05465082af0302970a9a22ae1e4ac44d8541b25d31e8"
+    ], 
+    "wheelhouse/six-1.10.0.tar.gz": [
+      "layer:basic", 
+      "dynamic", 
+      "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
+    ], 
+    "lib/charms/apt.py": [
+      "layer:apt", 
+      "static", 
+      "1f95351be322b40cf6c01fcac128b3fe338516e96cf4314071a89d84a11387c7"
+    ]
+  }
+}
 \ No newline at end of file
 
=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2016-07-14 17:53:24 +0000
@@ -0,0 +1,2 @@
+*~
+*.pyc
 
=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2016-07-14 17:53:24 +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	2016-01-12 08:17:38 +0000
+++ README.md	2016-07-14 17:53:24 +0000
@@ -28,8 +28,12 @@
 
 Download of Product Binaries
 ----------------------------
-For deploying IBM DB2 charm the user needs to download the correct package as mentioned in the `Usage` section into an SFTP server. The  IBM DB2 charm will connect to the SFTP server, download and deploy the same. The SFTP server can be any Power Ubuntu/X86 Ubuntu server and should be copied into a directory structure as below
-`/home/charm/repository/<productname>/<package.tar>`. The complete path where the package is stored is a configurable item in config.yaml file and needs to be configured before deploying the charm. The charm will download the package from this server using SFTP. Hence make sure the SFTP link is accessible. 
+For deploying IBM DB2 charm the user needs to download the correct package as mentioned in the `Usage` section and host it on an SFTP or Web server. The  IBM DB2 charm will connect to the server(either by SFTP or HTTP method) to download and deploy the same. The host server can be any Power Ubuntu/X86 Ubuntu servers and should be copied into a directory structure as below
+
+`/<path to charm dir>/charm/repository/<productname>/<package.tar>`
+
+The complete path where the package is stored is a configurable item which needs to be configured before deploying the charm. 
+
 
 Memory and Disk Requirements
 ----------------------------
@@ -39,7 +43,7 @@
 
 Deploy
 ------
-To deploy DB2 charm run the following command:
+To deploy DB2 charm, run the following command:
 
 1. Make sure the appropriate memory requirements are made available
 
@@ -48,43 +52,37 @@
         juju add-machine
         juju deploy --to <machine number> --repository=<path_to_charms_folder> local:trusty/ibm-db2
 
-3. Set all required config values like the SFTP server,  package name, directory in SFTP server where package is kept, username and password to connect to SFTP host and checksum value to proceed with installation, by using juju set command. To provide these run the following command: 
-
-
-        juju set ibm-db2 host=<host-name>
-        juju set ibm-db2 package_dir=<full-path-to-the-directory>
-        juju set ibm-db2 username=<user-name>
-        juju set ibm-db2 password=<passwd>
-        juju set ibm-db2 db2_package_name=<package-name>
-        juju set ibm-db2 sha= <checksum-value>
-
-  For eg:
-
-        juju set ibm-db2 host="x.x.x.x"
-        juju set ibm-db2 package_dir="/home/charm/repository/ibm-db2"
-        juju set ibm-db2 username="user1"
-        juju set ibm-db2 password="password"
-        juju set ibm-db2 db2_package_name="DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
-        juju set ibm-db2 sha=80501df818faf4f095b5a58210a0e110509fcb70
-
+3. Set all required config values like the curl__opts to log into the host machine and curl_url which specifies the url to download the packages, by using juju set command. To provide these run the following command: 
+
+        juju set ibm-db2 curl_opts=<login credentials>
+        juju set ibm-db2 curl_url=<url to download package?shavalue>
+
+    For eg:
+
+        juju set ibm-db2 curl_opts="-u user:password"
+        juju set ibm-db2 curl_url="http://<ipaddress>/debs/ibm-db2/DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz?sha512=ae20be99e3cd2cef24d53a28331871d7193cfc7f7c24c580e6e78dc58c9ffb364cbcc69cb3773d2f0135b8c9be7ee40a7dc4e09fec0a4d731c4864bbba87d31e"
    
-   The command to find the checksum value is `sha1sum <Package Name> | cut -d" " -f1`
+    The command to find the checksum value is `sha512sum <Package Name>`
+
+    In the above example sha512 is used, you can use sha256 or md5 as well.
+Also in the above example, the packages are hosted on webserver, so http protocol is used, if you have placed the packages on sftp server, then replace the protocol with sftp.
 
 4. At this point DB2 install will wait for you to accept the License. To install the downloaded binaries you must agree to the IBM license.  The license file(s) can be found in the product binaries you downloaded.
 
-    If you agree to the license, run the following command :
-
-        juju set ibm-db2 accept-ibm-db2-license=True
-
-    Juju deploy command will install db2 and will expose the hostname, portnumber, db2 instance, install path  and userid to the users. 
+If you agree to the license, run the following command :
+
+    juju set ibm-db2 license_accepted=True
+
+
+Juju deploy command will install db2 and will expose the hostname, port number, db2 instance, install path  and userid to the users. 
 
 
 Uninstallation of IBM DB2
 ---------------------------
 
-Setting the accept-ibm-db2-license to False will uninstall the product. 
+Setting the license_accepted to False will uninstall the product. 
 
-        juju set ibm-db2 accept-ibm-db2-license=False
+    juju set ibm-db2 license_accepted=False
 
 Additional configuration parameters 
 -----------------------------------
@@ -99,21 +97,10 @@
 
         juju set ibm-db2 dftdbpath="/tmp"
 
-* If you want to add a new user/password and instance name for DB2 you can do that by giving the following commands. 
-
-        juju set ibm-db2 db2_user=<newusername>
-        juju set ibm-db2 db2_pw=<newuserpassword>
-
-    For eg:
-
-        juju set ibm-db2 db2_user="user1"
-        juju set ibm-db2 db2_pw="user123"  
-
-If the db2_user and db2_pw is not set, then be default the charm will create db2usr1/db2usr123 using which you can connect and work with DB2. A new instance name with same name as db2_user will also be generated. 
 
 Installation Verification
 ------------------------
-Once IBM DB2 charm is deployed, the user can log into the container/machine where its deployed and use the db2_user/db2_pw combination to login as the db2 user. The user can run any db2 commands after this. 
+Once IBM DB2 charm is deployed, the user can log into the container/machine where it is deployed using the default user/password (db2inst1/db2inst1). The user can run any db2 commands after this. 
   
   * For creating a new DB the user may run the command:
 
@@ -127,42 +114,57 @@
 
         db2
 
+Relating with other consumer charms
+----------------------------------
+IBM DB2 charm can be related to other consumer charms using the following command.
+
+    juju add-relation ibm-db2 <consumer-charm>
+
+When IBM DB2 charm is related to any consumer charm, it creates a db2instance, username/password as per the service name and will be provided to the consumer charm. IBM DB2 charm also creates DBs as provided by the consumer charm and returns the DB details once they are successfully created. The following code will help the consumer charm authors to pass the DB names to the IBM DB2 charm:   
+
+    @when 'db.connected'
+    function configure_dbs(){
+      dbnames="db1,db2"
+      relation_call --state=db.connected set_dbs $dbnames || true
+     }
+
+If no DB name is provided by consumer charm, IBM DB2 charm by default creates DBs according to  the service name.
+
+Also to set relation with IBM DB2 charm and make use of all the features, the consumer charm __should__ pass the ssh key from itself to IBM DB2 charm. The following code will help the consumer charm authors to do this :
+
+     @when 'db.connected'
+     @when_not 'test.sshconfigured'
+     function configure_sshkeys(){
+     SSH_PATH=/root/.ssh
+     if [ ! -f  $SSH_PATH/id_rsa.pub ]; then
+                juju-log "Setting up SSH keys."
+                ssh-keygen -t rsa -f $SSH_PATH/id_rsa -N ''
+     fi
+     key="`cat $SSH_PATH/id_rsa.pub`"
+     relation_call --state=db.connected set_ssh_keys $key || true`
+     set_state 'test.sshconfigured'
+    }
+
+Without this IBM DB2 charm will not be ready and will not create the DBs for the related services. 
 
 Configuration
 -------------
 See config.yaml file for more information.
 
-  *  `accept-ibm-db2-license`: True to accept license. Before you can use or install IBM DB2, 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 server/db2/license directory after downloading and extracting IBM DB2 there. Set the value of accept-ibm-db2-license to True if you agree to IBM DB2 license.
-
-  * `sha`                   : Check sum value to check integrity of IBM DB2 package. The Charm uses sha1sum to check the integrity. If empty, it will fail to deploy DB2. Cryptographic value should be altered by the user only when the package name is changed. Else it should not be altered. The command to find the check sum is 
-        
-        sha1sum <Package Name> | cut -d" " -f1
-
-     This value can be got from the administrator or the user can run the above command from the sftp server where the package resides. 
+  * `license_accepted`: True to accept license. Before you can use or install IBM DB2, 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 server/db2/license directory after downloading and extracting IBM DB2 there. Set the value of license_accepted to True if you agree to IBM DB2 license.
 
   * `dftdbpath`             : This parameter contains the default file path used to create databases under the database manager.  If no path is specified when a database is created, the database is created under the path specified by the dftdbpath parameter.
 
-  * `db2_user`              : The user name to connect to DB2 and work on the same. Db2 will create a new instance with the same name as this user name.
+  * `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.
   
-  * `db2_pw`                : The password for db2_user
-
-  * `host`                  : SFTP server where IBM DB2 packages is kept
-
-  * `package_dir`           : Path to find the IBM DB2 packages on the SFTP server
-
-  * `username`              : User name to connect to the SFTP server
-
-  * `password`              : Password to connect to the SFTP server
-
-  * `db2_package_name`      : Name of the DB2 package to be deployed
-
+  * `curl_opts`             : The options passed to the 'curl' command when fetching files from curl_url. 
 
 Additional product information
 ------------------------------
 
 ##### Enabling BLU acceleration for DB2 Advanced Enterprise Server Edition/DB2 Advanced Workgroup Server Edition
 
-The same DB2 charm(DB2 Enterprise Server Edition) can be extended to enable the BLU acceleration(DB2 Advanced Enterprise Server Edition/DB2 Advanced Workgroup Server Edition)  by following the below section. The DB2 charm has to be deployed first and then few settings needs to be done to enable the BLU feature. 
+The same DB2 charm(DB2 Enterprise Server Edition) can be extended to enable the BLU acceleration(DB2 Advanced Enterprise Server Edition/DB2 Advanced Workgroup Server Edition)  by following the below section. The DB2 charm has to be deployed first and then few settings need to be done to enable the BLU feature. 
 
 To upgrade DB2 Enterprise Server Edition (DB2 ESE) to DB2 Advanced Enterprise Server Edition(DB2 AESE) or DB2 Advanced Workgroup Server Edition (DB2 AWSE) the user need to accept the license for the same. Run the following command for accepting the AESE/AWSE license which the user procures on buying the Advanced Enterprise/ Workgroup Server Edition product. The user needs to log in using the configured user name/password to run the below commands.
 
@@ -185,7 +187,7 @@
     
 The output Default table organization              (DFT_TABLE_ORG) = COLUMN confirms that the DB2 AESE/AWSE with BLU is enabled. If the pre requisites for DB2 for AESE/AWSE is not set (accepting the proper license and setting the registry variable DB2_WORKLOAD) the above command would return Default table organization              (DFT_TABLE_ORG) = ROW.  Column-organized tables store each column on a separate set of pages on disk. Organizing data by column on disk reduces the amount of I/O needed for processing queries because only columns that are referenced in a query need to be accessed. 
 
-Once this is set all the tables created will be by default COLUMN organized where as without BLU acceleration the tables will be ROW organized. Also without proper license we cannot create COLUMN organized tables. Once we enable COLUMN organized tables, we can create either ROW enabled or COLUMN enabled tables using the option ORGANIZE BY ROW or ORGANIZE BY COLUMN while creating the tables by running the below commands from db2 command prompt.
+Once this is set all the tables created will be by default COLUMN organized whereas without BLU acceleration the tables will be ROW organized. Also without proper license we cannot create COLUMN organized tables. Once we enable COLUMN organized tables, we can create either ROW enabled or COLUMN enabled tables using the option ORGANIZE BY ROW or ORGANIZE BY COLUMN while creating the tables by running the below commands from db2 command prompt.
 
     create table sales_row(tid integer not null, prod_name varchar(30)) ORGANIZE BY ROW
     create table sales_col(tid integer not null, prod_name varchar(30)) ORGANIZE BY COLUMN
@@ -196,6 +198,14 @@
     
 More details on BLU feature can be found in the link [db2-BLU-acceleration]
 
+IBM DB2 Limitations
+-------------------
+If you are running linux containers on a host with kernel < 3.16, be advised that db2start will not succeed because of a hard coded 32MB kernel.shmmax setting.  You will need to upgrade your host to kernel 3.16 or greater by following the instructions here:
+
+https://wiki.ubuntu.com/Kernel/LTSEnablementStack
+
+DB2 also needs to be deployed using a non-zfs filesystem for container deployment. ZFS file system might cause some of the db2 commands to error out.
+
 IBM DB2 Links and Contacts
 --------------------------
 
@@ -237,3 +247,7 @@
 
 
 
+
+
+
+
 
=== added directory 'bin'
=== added file 'bin/layer_option'
--- bin/layer_option	1970-01-01 00:00:00 +0000
+++ bin/layer_option	2016-07-14 17:53:24 +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)
 
=== modified file 'config.yaml'
--- config.yaml	2015-12-07 02:57:11 +0000
+++ config.yaml	2016-07-14 17:53:24 +0000
@@ -1,71 +1,62 @@
-options:
-  accept-ibm-db2-license:
-    type: boolean
-    default: False
-    description: |
-        The DB2 software can only be used by
-        accepting the terms and conditions for IBM DB2 License.
-        Setting this option to True 
-        indicates that you have read and accepted the IBM DB2 terms and 
-        conditions found in the license file. The details about accessing
-        the license(s) can be found in the README.
-        Do not set this to False if a relation exists 
-  db2_user:
-    type: string
-    default: "db2usr1"
-    description: |
-        The username using which the user can connect to the db2. 
-        Once db2 is installed this user name is generated and the user can 
-        perform all db2 operations using this user.
-  db2_pw:
-    type: string
-    default: "db2usr123"
-    description: |
-        The password used by the db2_user to connect to db2.
-  dftdbpath:
-    type: string
-    default: "/tmp"
-    description: |
-        This parameter contains the default file path used to create databases under
-        the database manager.  If no path is specified when a database is created, the
-        database is created under the path specified by the dftdbpath parameter.
-  host:
-    type: string
-    default: ""
-    description: |
-        SFTP server where IBM DB2 packages is kept. If not set or set
-        incorrectly, the charm cannot find the IBM DB2 software.
-  package_dir:
-    type: string
-    default: ""
-    description: |
-        Path to find the IBM DB2 packages on the SFTP server. If not set or set incorrectly, the charm cannot find the
-        IBM DB2 software.
-  username:
-    type: string
-    default: ""
-    description: |
-        User name to connect to the SFTP server. If not
-        set or set incorrectly, the charm not able to download the software.
-  password:
-    type: string
-    default: ""
-    description: |
-        Password to connect to the SFTP server. If not
-        set or set incorrectly, the charm not able to download the software.
-  db2_package_name:
-    type: string
-    default: "DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
-    description: |
-         Name of the DB2 package. If not set, the Charm uses a 
-         predefined package name for download from the url location. 
-         If the predefined package is not available at url location or 
-         if set incorrectly,the charm cannot install the DB2 software.
-  sha:
-    type: string
-    default: ""
-    description: |
-        Checksum value to check integrity of IBM DB2 pacakage. The Charm uses 
-        sha1sum to check the integrity. If empty, it throws an error and stop the 
-        deployment. The command to find the checksum is
-        sha1sum <Package Name> | cut -d" " -f1
+"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": !!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.
+  "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": ""
+  "dftdbpath":
+    "type": "string"
+    "default": "/tmp"
+    "description": |
+      This parameter contains the default file path used to create databases under
+      the database manager.  If no path is specified when a database is created, the
+      database is created under the path specified by the dftdbpath parameter.
 
=== modified file 'copyright'
--- copyright	2015-07-14 11:32:09 +0000
+++ copyright	2016-07-14 17:53:24 +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 file 'files/archives/db2inst1.INS'
--- files/archives/db2inst1.INS	1970-01-01 00:00:00 +0000
+++ files/archives/db2inst1.INS	2016-07-14 17:53:24 +0000
@@ -0,0 +1,119 @@
+;Use BINARY file transfer
+
+[FILE_DESCRIPTION]
+APPLICATION=DB2/LINUXX8664 0.5.3
+FILE_CONTENT=DB2 CCA Exported Data Sources
+FILE_TYPE=CommonServer
+FILE_FORMAT_VERSION=2.0
+Platform=30
+DB2SYSTEM=ISLRPBEIXV665
+Instance=db2inst1
+
+[REGISTRY_LOCAL]
+DB2COMM=TCPIP
+DB2AUTOSTART=NO
+
+[DBM_CONFIG]
+NODETYPE=4
+RELEASE=0x1000
+DIAGLEVEL=3
+ALTERNATE_AUTH_ENC=255
+RQRIOBLK=65535
+AUTHENTICATION=0
+DIR_CACHE=1
+DISCOVER=2
+TP_MON_NAME=
+SYSADM_GROUP=DB2GRP1 
+SYSCTRL_GROUP=
+SYSMAINT_GROUP=
+SYSMON_GROUP=
+TM_DATABASE=1ST_CONN
+DFT_ACCOUNT_STR=
+CATALOG_NOAUTH=0
+NOTIFYLEVEL=3
+JAVA_HEAP_SZ=2048
+FEDERATED=0
+FED_NOAUTH=0
+UTIL_IMPACT_LIM=10
+GROUP_PLUGIN=
+CLNT_PW_PLUGIN=
+CLNT_KRB_PLUGIN=
+LOCAL_GSSPLUGIN=
+MAX_QUERYDEGREE=-1
+AUDIT_BUF_SZ=0
+INTRA_PARALLEL=0
+NUMDB=32
+INITFENCED_JVM=0
+INDEXREC=2
+SHEAPTHRES=0
+BACKBUFSZ=1024
+RESTBUFSZ=1024
+ASLHEAPSZ=15
+FENCED_POOL=AUTOMATIC-1
+KEEPFENCED=1
+AGENTPRI=-1
+SSL_SVR_KEYDB=
+SSL_SVR_STASH=
+SSL_SVR_LABEL=
+SSL_SVCENAME=
+SSL_CIPHERSPECS=
+SSL_VERSIONS=
+SSL_CLNT_KEYDB=
+SSL_CLNT_STASH=
+DFT_MON_UOW=OFF
+DFT_MON_STMT=OFF
+DFT_MON_TABLE=OFF
+DFT_MON_BUFPOOL=OFF
+DFT_MON_LOCK=OFF
+DFT_MON_SORT=OFF
+DFT_MON_TIMESTAMP=ON
+CPUSPEED=1.889377e-07
+MAXTOTFILOP=0
+AGENT_STACK_SZ=1024
+MON_HEAP_SZ=AUTOMATIC90
+RESYNC_INTERVAL=180
+SPM_LOG_FILE_SZ=256
+SPM_MAX_RESYNC=20
+TRUST_ALLCLNTS=YES
+NUM_INITFENCED=0
+SPM_NAME=islrpbei
+NUM_INITAGENTS=0
+MAX_COORDAGENTS=AUTOMATIC200
+NUM_POOLAGENTS=AUTOMATIC100
+FCM_NUM_BUFFERS=4096
+FCM_NUM_CHANNELS=AUTOMATIC2048
+DISCOVER_INST=1
+MAX_CONNECTIONS=AUTOMATIC-1
+INSTANCE_MEMORY=AUTOMATIC1698252
+HEALTH_MON=OFF
+SRV_PLUGIN_MODE=1
+SRVCON_PW_PLUGIN=
+SRVCON_GSSPLUGIN_LIST=
+COMM_BANDWIDTH=1.000000e+02
+CONN_ELAPSE=10
+MAX_CONNRETRIES=5
+MAX_TIME_DIFF=60
+START_STOP_TIME=10
+FEDERATED_ASYNC=0
+
+[INST>db2inst1]
+instance_name=db2inst1
+NodeType=4
+ServerType=DB2LINUXX8664
+Authentication=SERVER
+DB2COMM=TCPIP
+
+[DB>!LOCAL:APPCNTR]
+Dir_entry_type=INDIRECT
+Drive=/home/db2inst1
+DBName=APPCNTR
+
+[DB>!LOCAL:WRKLGHT]
+Dir_entry_type=INDIRECT
+Drive=/home/db2inst1
+DBName=WRKLGHT
+
+[DB>!LOCAL:TUT_DB]
+Dir_entry_type=INDIRECT
+Drive=/home/db2inst1
+DBName=TUT_DB
 
=== removed directory 'files/archives/db2installresfile'
=== removed file 'files/archives/db2installresfile/db2inst1.INS'
--- files/archives/db2installresfile/db2inst1.INS	2015-07-14 11:32:09 +0000
+++ files/archives/db2installresfile/db2inst1.INS	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-;Use BINARY file transfer
-
-[FILE_DESCRIPTION]
-APPLICATION=DB2/LINUXX8664 0.5.3
-FILE_CONTENT=DB2 CCA Exported Data Sources
-FILE_TYPE=CommonServer
-FILE_FORMAT_VERSION=2.0
-Platform=30
-DB2SYSTEM=ISLRPBEIXV665
-Instance=db2inst1
-
-[REGISTRY_LOCAL]
-DB2COMM=TCPIP
-DB2AUTOSTART=NO
-
-[DBM_CONFIG]
-NODETYPE=4
-RELEASE=0x1000
-DIAGLEVEL=3
-ALTERNATE_AUTH_ENC=255
-RQRIOBLK=65535
-AUTHENTICATION=0
-DIR_CACHE=1
-DISCOVER=2
-TP_MON_NAME=
-SYSADM_GROUP=DB2GRP1 
-SYSCTRL_GROUP=
-SYSMAINT_GROUP=
-SYSMON_GROUP=
-TM_DATABASE=1ST_CONN
-DFT_ACCOUNT_STR=
-CATALOG_NOAUTH=0
-NOTIFYLEVEL=3
-JAVA_HEAP_SZ=2048
-FEDERATED=0
-FED_NOAUTH=0
-UTIL_IMPACT_LIM=10
-GROUP_PLUGIN=
-CLNT_PW_PLUGIN=
-CLNT_KRB_PLUGIN=
-LOCAL_GSSPLUGIN=
-MAX_QUERYDEGREE=-1
-AUDIT_BUF_SZ=0
-INTRA_PARALLEL=0
-NUMDB=32
-INITFENCED_JVM=0
-INDEXREC=2
-SHEAPTHRES=0
-BACKBUFSZ=1024
-RESTBUFSZ=1024
-ASLHEAPSZ=15
-FENCED_POOL=AUTOMATIC-1
-KEEPFENCED=1
-AGENTPRI=-1
-SSL_SVR_KEYDB=
-SSL_SVR_STASH=
-SSL_SVR_LABEL=
-SSL_SVCENAME=
-SSL_CIPHERSPECS=
-SSL_VERSIONS=
-SSL_CLNT_KEYDB=
-SSL_CLNT_STASH=
-DFT_MON_UOW=OFF
-DFT_MON_STMT=OFF
-DFT_MON_TABLE=OFF
-DFT_MON_BUFPOOL=OFF
-DFT_MON_LOCK=OFF
-DFT_MON_SORT=OFF
-DFT_MON_TIMESTAMP=ON
-CPUSPEED=1.889377e-07
-MAXTOTFILOP=0
-AGENT_STACK_SZ=1024
-MON_HEAP_SZ=AUTOMATIC90
-RESYNC_INTERVAL=180
-SPM_LOG_FILE_SZ=256
-SPM_MAX_RESYNC=20
-TRUST_ALLCLNTS=YES
-NUM_INITFENCED=0
-SPM_NAME=islrpbei
-NUM_INITAGENTS=0
-MAX_COORDAGENTS=AUTOMATIC200
-NUM_POOLAGENTS=AUTOMATIC100
-FCM_NUM_BUFFERS=4096
-FCM_NUM_CHANNELS=AUTOMATIC2048
-DISCOVER_INST=1
-MAX_CONNECTIONS=AUTOMATIC-1
-INSTANCE_MEMORY=AUTOMATIC1698252
-HEALTH_MON=OFF
-SRV_PLUGIN_MODE=1
-SRVCON_PW_PLUGIN=
-SRVCON_GSSPLUGIN_LIST=
-COMM_BANDWIDTH=1.000000e+02
-CONN_ELAPSE=10
-MAX_CONNRETRIES=5
-MAX_TIME_DIFF=60
-START_STOP_TIME=10
-FEDERATED_ASYNC=0
-
-[INST>db2inst1]
-instance_name=db2inst1
-NodeType=4
-ServerType=DB2LINUXX8664
-Authentication=SERVER
-DB2COMM=TCPIP
-
-[DB>!LOCAL:APPCNTR]
-Dir_entry_type=INDIRECT
-Drive=/home/db2inst1
-DBName=APPCNTR
-
-[DB>!LOCAL:WRKLGHT]
-Dir_entry_type=INDIRECT
-Drive=/home/db2inst1
-DBName=WRKLGHT
-
-[DB>!LOCAL:TUT_DB]
-Dir_entry_type=INDIRECT
-Drive=/home/db2inst1
-DBName=TUT_DB
 
=== removed file 'files/archives/db2installresfile/db2server.rsp'
--- files/archives/db2installresfile/db2server.rsp	2015-07-14 11:32:09 +0000
+++ files/archives/db2installresfile/db2server.rsp	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-*--------------------------------------------------------
-* The response file is generated by the db2rspgn command 
-*--------------------------------------------------------
-*--------------------------
-* Product Installation
-*--------------------------
-PROD = DB2_SERVER_EDITION
-FILE = /opt/ibm/db2/V10.5
-LIC_AGREEMENT = ACCEPT
-INSTALL_TYPE = CUSTOM
-COMP = BASE_CLIENT
-COMP = JAVA_SUPPORT
-COMP = SQL_PROCEDURES
-COMP = BASE_DB2_ENGINE
-COMP = CONNECT_SUPPORT
-COMP = DB2_DATA_SOURCE_SUPPORT
-COMP = SPATIAL_EXTENDER_SERVER_SUPPORT
-COMP = JDK
-COMP = LDAP_EXPLOITATION
-COMP = INSTANCE_SETUP_SUPPORT
-COMP = ACS
-COMP = SPATIAL_EXTENDER_CLIENT_SUPPORT
-COMP = COMMUNICATION_SUPPORT_TCPIP
-COMP = APPLICATION_DEVELOPMENT_TOOLS
-COMP = DB2_UPDATE_SERVICE
-COMP = REPL_CLIENT
-COMP = DB2_SAMPLE_DATABASE
-COMP = TEXT_SEARCH
-COMP = INFORMIX_DATA_SOURCE_SUPPORT
-COMP = ORACLE_DATA_SOURCE_SUPPORT
-COMP = FIRST_STEPS
-COMP = GUARDIUM_INST_MNGR_CLIENT
-*--------------------------
-* Installed Languages
-*--------------------------
-LANG = EN
-*--------------------------
-* Instance Properties
-*--------------------------
-INSTANCE = db2inst1
-db2inst1.NAME = db2inst1
-db2inst1.UID = db2inst1_uid
-db2inst1.GROUP_NAME = db2grp1
-db2inst1.GID = db2inst1_gid
-db2inst1.HOME_DIRECTORY = /home/db2inst1_homedir
-db2inst1.PASSWORD = db2inst1_password
-db2inst1.CLIENT_IMPORT_PROFILE = db2inst1.INS
-db2inst1.TYPE = ese
-db2inst1.FENCED_USERNAME = db2fenc1
-db2inst1.FENCED_UID = db2fenc1_uid
-db2inst1.FENCED_GROUP_NAME = db2fgrp1
-db2inst1.FENCED_GID = db2fenc1_gid
-db2inst1.FENCED_HOME_DIRECTORY = /home/db2fenc1
-db2inst1.FENCED_PASSWORD = db2fenc1
-db2inst1.CONFIGURE_TEXT_SEARCH = NO
-*--------------------------
-* DAS Properties
-*__________________________
-DAS_USERNAME = dasusr1
-DAS_UID = das_uid
-DAS_GROUP_NAME = dasadm1
-DAS_GID = das_gid
-DAS_HOME_DIRECTORY = /home/dasusr1
-DAS_PASSWORD = dasusr1
 
=== removed file 'files/archives/db2installresfile/db2server_ppcle.rsp'
--- files/archives/db2installresfile/db2server_ppcle.rsp	2015-07-14 11:32:09 +0000
+++ files/archives/db2installresfile/db2server_ppcle.rsp	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-*--------------------------------------------------------
-* The response file is generated by the db2rspgn command 
-*--------------------------------------------------------
-*--------------------------
-* Product Installation
-*--------------------------
-PROD = DB2_SERVER_EDITION
-FILE = /opt/ibm/db2/V10.5
-LIC_AGREEMENT = ACCEPT
-INSTALL_TYPE = CUSTOM
-COMP = BASE_CLIENT
-COMP = JAVA_SUPPORT
-COMP = SQL_PROCEDURES
-COMP = BASE_DB2_ENGINE
-COMP = CONNECT_SUPPORT
-COMP = DB2_DATA_SOURCE_SUPPORT
-COMP = SPATIAL_EXTENDER_SERVER_SUPPORT
-COMP = JDK
-COMP = LDAP_EXPLOITATION
-COMP = INSTANCE_SETUP_SUPPORT
-*COMP = ACS
-COMP = SPATIAL_EXTENDER_CLIENT_SUPPORT
-COMP = COMMUNICATION_SUPPORT_TCPIP
-COMP = APPLICATION_DEVELOPMENT_TOOLS
-COMP = DB2_UPDATE_SERVICE
-COMP = REPL_CLIENT
-COMP = DB2_SAMPLE_DATABASE
-COMP = TEXT_SEARCH
-COMP = INFORMIX_DATA_SOURCE_SUPPORT
-COMP = ORACLE_DATA_SOURCE_SUPPORT
-COMP = FIRST_STEPS
-COMP = GUARDIUM_INST_MNGR_CLIENT
-*--------------------------
-* Installed Languages
-*--------------------------
-LANG = EN
-*--------------------------
-* Instance Properties
-*--------------------------
-INSTANCE = db2inst1
-db2inst1.NAME = db2inst1
-db2inst1.UID = db2inst1_uid
-db2inst1.GROUP_NAME = db2grp1
-db2inst1.GID = db2inst1_gid
-db2inst1.HOME_DIRECTORY = /home/db2inst1_homedir
-db2inst1.PASSWORD = db2inst1_password
-db2inst1.CLIENT_IMPORT_PROFILE = db2inst1.INS
-db2inst1.TYPE = ese
-db2inst1.FENCED_USERNAME = db2fenc1
-db2inst1.FENCED_UID = db2fenc1_uid
-db2inst1.FENCED_GROUP_NAME = db2fgrp1
-db2inst1.FENCED_GID = db2fenc1_gid
-db2inst1.FENCED_HOME_DIRECTORY = /home/db2fenc1
-db2inst1.FENCED_PASSWORD = db2fenc1
-db2inst1.CONFIGURE_TEXT_SEARCH = NO
-*--------------------------
-* DAS Properties
-*__________________________
-DAS_USERNAME = dasusr1
-DAS_UID = das_uid
-DAS_GROUP_NAME = dasadm1
-DAS_GID = das_gid
-DAS_HOME_DIRECTORY = /home/dasusr1
-DAS_PASSWORD = dasusr1
 
=== added file 'files/archives/db2server.rsp'
--- files/archives/db2server.rsp	1970-01-01 00:00:00 +0000
+++ files/archives/db2server.rsp	2016-07-14 17:53:24 +0000
@@ -0,0 +1,64 @@
+*--------------------------------------------------------
+* The response file is generated by the db2rspgn command 
+*--------------------------------------------------------
+*--------------------------
+* Product Installation
+*--------------------------
+PROD = DB2_SERVER_EDITION
+FILE = /opt/ibm/db2/V10.5
+LIC_AGREEMENT = ACCEPT
+INSTALL_TYPE = CUSTOM
+COMP = BASE_CLIENT
+COMP = JAVA_SUPPORT
+COMP = SQL_PROCEDURES
+COMP = BASE_DB2_ENGINE
+COMP = CONNECT_SUPPORT
+COMP = DB2_DATA_SOURCE_SUPPORT
+COMP = SPATIAL_EXTENDER_SERVER_SUPPORT
+COMP = JDK
+COMP = LDAP_EXPLOITATION
+COMP = INSTANCE_SETUP_SUPPORT
+COMP = ACS
+COMP = SPATIAL_EXTENDER_CLIENT_SUPPORT
+COMP = COMMUNICATION_SUPPORT_TCPIP
+COMP = APPLICATION_DEVELOPMENT_TOOLS
+COMP = DB2_UPDATE_SERVICE
+COMP = REPL_CLIENT
+COMP = DB2_SAMPLE_DATABASE
+COMP = TEXT_SEARCH
+COMP = INFORMIX_DATA_SOURCE_SUPPORT
+COMP = ORACLE_DATA_SOURCE_SUPPORT
+COMP = FIRST_STEPS
+COMP = GUARDIUM_INST_MNGR_CLIENT
+*--------------------------
+* Installed Languages
+*--------------------------
+LANG = EN
+*--------------------------
+* Instance Properties
+*--------------------------
+INSTANCE = db2inst1
+db2inst1.NAME = db2inst1
+db2inst1.UID = db2inst1_uid
+db2inst1.GROUP_NAME = db2grp1
+db2inst1.GID = db2inst1_gid
+db2inst1.HOME_DIRECTORY = /home/db2inst1_homedir
+db2inst1.PASSWORD = db2inst1_password
+db2inst1.CLIENT_IMPORT_PROFILE = db2inst1.INS
+db2inst1.TYPE = ese
+db2inst1.FENCED_USERNAME = db2fenc1
+db2inst1.FENCED_UID = db2fenc1_uid
+db2inst1.FENCED_GROUP_NAME = db2fgrp1
+db2inst1.FENCED_GID = db2fenc1_gid
+db2inst1.FENCED_HOME_DIRECTORY = /home/db2fenc1
+db2inst1.FENCED_PASSWORD = db2fenc1
+db2inst1.CONFIGURE_TEXT_SEARCH = NO
+*--------------------------
+* DAS Properties
+*__________________________
+DAS_USERNAME = dasusr1
+DAS_UID = das_uid
+DAS_GROUP_NAME = dasadm1
+DAS_GID = das_gid
+DAS_HOME_DIRECTORY = /home/dasusr1
+DAS_PASSWORD = dasusr1
 
=== added file 'files/archives/db2server_ppcle.rsp'
--- files/archives/db2server_ppcle.rsp	1970-01-01 00:00:00 +0000
+++ files/archives/db2server_ppcle.rsp	2016-07-14 17:53:24 +0000
@@ -0,0 +1,64 @@
+*--------------------------------------------------------
+* The response file is generated by the db2rspgn command 
+*--------------------------------------------------------
+*--------------------------
+* Product Installation
+*--------------------------
+PROD = DB2_SERVER_EDITION
+FILE = /opt/ibm/db2/V10.5
+LIC_AGREEMENT = ACCEPT
+INSTALL_TYPE = CUSTOM
+COMP = BASE_CLIENT
+COMP = JAVA_SUPPORT
+COMP = SQL_PROCEDURES
+COMP = BASE_DB2_ENGINE
+COMP = CONNECT_SUPPORT
+COMP = DB2_DATA_SOURCE_SUPPORT
+COMP = SPATIAL_EXTENDER_SERVER_SUPPORT
+COMP = JDK
+COMP = LDAP_EXPLOITATION
+COMP = INSTANCE_SETUP_SUPPORT
+*COMP = ACS
+COMP = SPATIAL_EXTENDER_CLIENT_SUPPORT
+COMP = COMMUNICATION_SUPPORT_TCPIP
+COMP = APPLICATION_DEVELOPMENT_TOOLS
+COMP = DB2_UPDATE_SERVICE
+COMP = REPL_CLIENT
+COMP = DB2_SAMPLE_DATABASE
+COMP = TEXT_SEARCH
+COMP = INFORMIX_DATA_SOURCE_SUPPORT
+COMP = ORACLE_DATA_SOURCE_SUPPORT
+COMP = FIRST_STEPS
+COMP = GUARDIUM_INST_MNGR_CLIENT
+*--------------------------
+* Installed Languages
+*--------------------------
+LANG = EN
+*--------------------------
+* Instance Properties
+*--------------------------
+INSTANCE = db2inst1
+db2inst1.NAME = db2inst1
+db2inst1.UID = db2inst1_uid
+db2inst1.GROUP_NAME = db2grp1
+db2inst1.GID = db2inst1_gid
+db2inst1.HOME_DIRECTORY = /home/db2inst1_homedir
+db2inst1.PASSWORD = db2inst1_password
+db2inst1.CLIENT_IMPORT_PROFILE = db2inst1.INS
+db2inst1.TYPE = ese
+db2inst1.FENCED_USERNAME = db2fenc1
+db2inst1.FENCED_UID = db2fenc1_uid
+db2inst1.FENCED_GROUP_NAME = db2fgrp1
+db2inst1.FENCED_GID = db2fenc1_gid
+db2inst1.FENCED_HOME_DIRECTORY = /home/db2fenc1
+db2inst1.FENCED_PASSWORD = db2fenc1
+db2inst1.CONFIGURE_TEXT_SEARCH = NO
+*--------------------------
+* DAS Properties
+*__________________________
+DAS_USERNAME = dasusr1
+DAS_UID = das_uid
+DAS_GROUP_NAME = dasadm1
+DAS_GID = das_gid
+DAS_HOME_DIRECTORY = /home/dasusr1
+DAS_PASSWORD = dasusr1
 
=== removed file 'files/sftp_get.sh'
--- files/sftp_get.sh	2015-12-09 05:27:29 +0000
+++ files/sftp_get.sh	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/usr/bin/expect
-# Helper script to connect and download using sftp
-# Usage: sftp_get.sh user password host remote_dir localpath
-
-set user [lindex $argv 0]
-set password [lindex $argv 1]
-set host [lindex $argv 2]
-set r_dir [lindex $argv 3]
-set localpath [lindex $argv 4]
-
-set timeout 90
-spawn sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $user@$host
-expect "password:"
-send "$password\n"
-expect "sftp>"
-set timeout 3000
-send "get -r $r_dir $localpath\n"
-expect "sftp>"
-send "exit\n"
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2016-01-12 08:17:38 +0000
+++ hooks/config-changed	2016-07-14 17:53:24 +0000
@@ -1,568 +1,19 @@
-#!/bin/bash
-
-set -e
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
-ARCHITECTURE=`uname -m`
-ARCHIVE_DIR=$CHARM_DIR/files/archives
-DB2_ARCHIVE_DIR=`pwd`
-DB2_USER=db2inst1
-DB2_USER_PW=db2inst1
-# Check whether DB2 is installed
-is_db2_installed()
-{
-	if [ -d $DB2_INSTALL_PATH/bin ]; then
-		echo "True"
-	else
-		echo "False"
-	fi
-}
-#Download DB2 package
-
-download_db2()
-{
-	HOST=`config-get host`
-	PACKAGE_DIR=`config-get package_dir`
-	USERNAME=`config-get username`
-	PASSWORD=`config-get password`
-
-	#Exit if URL to download package is null
-	if [ "$USERNAME" == "" -o "$PASSWORD" == "" -o "$HOST" == "" -o "$PACKAGE_DIR" == "" ]; then
-		juju-log "IBM DB2: Failed to download files from repository. Please provide values for host,package_dir,username and password in config.yaml"
-		status-set blocked "please set db2_url"
-		exit 0
-	fi
-
-	# If an install was done, get the name of the package from which it was done
-	if [ -f  $ARCHIVE_DIR/*.gz ]; then
-		pkg_name=`ls  $ARCHIVE_DIR/*.gz`
-		if [ $? == 0 ]; then
-			pkg_name=`basename $pkg_name`
-		fi
-	fi
-	# Get the package name to check whether the user wants to install a different package$
-	cfg_pkg_name=`config-get db2_package_name`
-
-	# Set package name to a predefined value if the user has not provided a package name
-	if [ "$cfg_pkg_name" == "" ]; then
-		ARCHITECTURE=`uname -m`
-		if [ "$ARCHITECTURE" = "x86_64" ]; then
-			cfg_pkg_name="DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
-		else
-			cfg_pkg_name="DB2_Svr_10.5.0.5_Linux_ppcle.tar.gz"
-		fi
-	fi
-
-	#Check whether user has selected right package name from the package name string. If he selects wrong package name , install would fail.
-
-	if [ "$ARCHITECTURE" = "x86_64" ]; then
-		juju-log "Checking the package name"
-		if echo "$cfg_pkg_name" | grep -q "x86"; then
-			juju-log "IBM DB2: Package name is matching for the platform"
-		else
-			juju-log "IBM DB2: Probably Not the right package. DB2 install will fail if its not the right package"
-			status-set blocked "Probably Not the right package. Please configure the correct package name"
-			exit 0
-		fi
-	else
-		if echo "$cfg_pkg_name" | grep -q "ppcle"; then
-			juju-log "IBM DB2: Package name is matching for the platform"
-		else
-			juju-log "IBM DB2: Probably Not the right package. DB2 install will fail if its not the right package"
-			status-set blocked "Probably Not the right package. Please configure the correct package name"
-			exit 0
-		fi
-	fi
-
-	#The user has configured a different package name
-	if  [ "$pkg_name" != "$cfg_pkg_name" ]; then
-
-		#Download the new DB2 package
-		#set +e
-		juju-log "IBM DB2: Downloading DB2 package."
-		juju-log $cfg_pkg_name
-		status-set maintenance "Downloading IBM DB2 package"
-		set +e
-		$CHARM_DIR/files/sftp_get.sh $USERNAME $PASSWORD $HOST $PACKAGE_DIR/$cfg_pkg_name $ARCHIVE_DIR
-
-		if [ $? == 0 ]; then
-			juju-log "IBM DB2: Downloaded DB2 package."
-			# Delete previously  downloaded and installed DB2 package
-			if [ "$pkg_name" != "" ]; then
-				juju-log "IBM DB2: Deleting the older DB2 package."
-				rm   $ARCHIVE_DIR/$pkg_name
-				rm -rf $ARCHIVE_DIR/server*
-				remove_software
-				juju-log "IBM DB2: Deleted the older DB2 package."
-			fi
-
-		else
-			juju-log "IBM DB2: Download of DB2 package failed."
-			juju-log "IBM DB2: Ensure the download URL and package name are correctly set in the charm configuration."
-			exit 0
-		fi
-		set -e
-	fi
-
-
-}
-# Remove DB2, if installed
-remove_software()
-{
-	db2_inst=`is_db2_installed`
-	if  [ $db2_inst == True ]; then
-		juju-log "IBM DB2: Removing IBM DB2 software......"
-		status-set maintenance "Removing IBM DB2"
-		
-		#finding the DB alias names to be dropped and dropping all Databases in that
-		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
-		do
-			juju-log "IBM DB2: Dropping the Databases for the instance $queue1"
-			for queue in `su - $queue1 -c 'db2 list db directory | grep "Database alias" | cut -d"=" -f2'`;
-			do
-				queue=`echo $queue | xargs`				
-				juju-log "IBM DB2: Dropping the DB $queue"
-				su - $queue1 -c 'db2 drop database '$queue
-				if [ $? == 0 ]; then
-					juju-log "IBM DB2: Dropped the DB $queue"
-				else	
-					juju-log "IBM DB2: Dropping the DB $queue failed"
-					status-set blocked "Dropping the DB failed"
-					exit 0
-				fi
-			done
-			juju-log "IBM DB2: Stopping the DB for $queue1"
-
-			if su - $queue1 -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$queue1
-			then
-				su - $queue1 -c 'db2 force application all'
-				su - $queue1 -c 'db2stop'
-				if [ $? == 0 ]; then
-					juju-log "IBM DB2: Stopped the DB for the instance $queue1"
-				else
-					juju-log "IBM DB2: Stopping the DB for $queue1 failed"
-					status-set blocked "Stopping the DB for $queue1 failed"
-					exit 0
-				fi
-	
-			else
-				juju-log "IBM DB2: DB2 is already stopped"
-			fi
-		done
-
-		#drop the das
-		cd $DB2_INSTALL_PATH/instance
-		juju-log "IBM DB2: Dropping the DAS"
-		./dasdrop
-		if [ $? == 0 ]; then
-			juju-log "IBM DB2: Dropped the DAS"
-		else
-			juju-log "IBM DB2: Dropping the DAS failed"
-			status-set blocked "Dropping the DAS failed"
-			exit 0
-		fi
-
-		#delete the instances
-		su - $DB2_USER -c 'db2ilist'
-		
-		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
-		do
-			juju-log "IBM DB2: Deleting the instance $queue1"
-			/opt/ibm/db2/V10.5/instance/db2idrop $queue1
-			if [ $? == 0 ]; then
-				juju-log "IBM DB2: Deleted  the instance $queue1"
-			else
-				juju-log "IBM DB2: Deleting the instance $queue1 failed"
-				status-set blocked "Deleting the instance $queue1 failed"
-				exit 0
-			fi
-			
-		done
-		
-		#Delete the instance entries from /etc/services file
-		juju-log "IBM DB2: Deleting the entries from /etc/services"
-		sed -i '/db2c_/d' /etc/services
-		if [ $? == 0 ]; then
-			juju-log "IBM DB2: Deleted the entries from /etc/services"
-		else
-			juju-log "IBM DB2: Deletion of the entries from /etc/services failed"
-			status-set blocked "Deletion of the entries from /etc/services failed"
-			exit 0
-		fi
-
-		#uninstall
-		juju-log "IBM DB2: Uninstall "
-		cd /opt/ibm/db2/V10.5/install
-		set +e
-		./db2_deinstall -a
-		if [ $? == 0 ]; then
-			juju-log "IBM DB2: Uninstall of db2 successful"
-		else
-			juju-log "IBM DB2: Uninstall of db2 failed"
-			status-set blocked "IBM DB2 Uninstallation failed"
-			exit 0
-		fi
-		set -e
-		cd /opt/ibm
-		rm -rf db2
-		juju-log "IBM DB2: Finished Uninstalling......."
-		status-set blocked "IBM DB2 Uninstalled"
-
-	else
-		juju-log "IBM DB2: DB2 not installed"
-	fi
-
-}
-
-# Remove DB2 if license not accpeted
-remove_unaccepted_software()
-{
-
-	if  [ $1 == False ]; then
-		juju-log "IBM DB2: Removing IBM DB2 (if installed) as the license agreement is not accepted."
-		remove_software
-	fi 
-
-}
-# Update system configuration after installing DB2
-configure_system()
-{
-	juju-log "IBM DB2: Updating system configuration."
-	cd $DB2_INSTALL_PATH/instance
-	su - $DB2_USER -c 'db2set DB2COMM=tcpip'
-
-	#Start DB for the DB2_user
-	if su - $DB2_USER -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$DB2_USER;
-	then
-		juju-log "IBM DB2: DB2 already started for the user $DB2_USER"
-	else
-		su - $DB2_USER -c 'db2start'
-		juju-log "IBM DB2: DB2 is started"
-	fi
-
-	service_name=`su - $DB2_USER -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
-	port_num=`grep $service_name /etc/services | cut -d"/" -f1 | cut -f2`
-	port_num=`echo $port_num | xargs`
-	if su - $DB2_USER -c 'netstat -an | grep '$port_num;
-	then
-		juju-log "DB2 started on port $port_num"
-	else
-		juju-log "DB2 not started on port $port_num"
-		exit 1
-	fi
-
-	juju-log "IBM DB2: Updated system configuration."
-
-}
-#Configure dftdbpath
-configure_dftdbpath()
-{
-	db2_inst=`is_db2_installed`
-	if  [ $db2_inst == True ]; then	
-		cfgdbpath=`config-get dftdbpath`
-		#If null, assign the default value
-		if [ "cfgdbpath" == "" ]
-		then	
-			cfgdbpath="/tmp"
-		fi
-		for queue1 in `su - $DB2_USER -c 'db2ilist'`;	
-		do
-			su - $queue1 -c 'db2 attach to '$queue1
-			dbpath=`su - $queue1 -c 'db2 get dbm cfg|grep -i DFTDBPATH|cut -d"=" -f2'`
-			cfgdbpath=`echo $cfgdbpath | xargs`
-			dbpath=`echo $dbpath | xargs`
-			if  [ "$cfgdbpath" != "$dbpath" ]; then
-				if [ -d "$cfgdbpath" ]; then
-					su - $queue1 -c 'db2 update dbm cfg using DFTDBPATH '$cfgdbpath
-					if [ $? == 0 ]; then
-						juju-log "DFTDBPATH changed to $cfgdbpath"
-					else
-						juju-log "Unable to set DFTDBPATH to $cfgdbpath"
-						exit 0
-					fi
-				else
-					juju-log "Not a valid path. Please check the path and run the command again"
-					exit 0
-				fi
-			fi
-		done
-	else
-		juju-log "IBM DB2: DB2 is not installed. Install DB2 to change the dbpath"
-		exit 0	
-	fi
-}
-# Edit the response file for UID
-edit_responsefile()
-{
-	rsp_file=db2server_temp.rsp
-	if [ "$ARCHITECTURE" = "x86_64" ]; then
-		orgrsp_file=db2server.rsp
-	else
-		orgrsp_file=db2server_ppcle.rsp
-	fi
-	cp $CHARM_DIR/files/archives/db2installresfile/$orgrsp_file $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-
-	db2uid=`id $DB2_USER | cut -d"=" -f2 | cut -d"(" -f1`
-	sed -i s/db2inst1_uid/$db2uid/g  $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-	sed -i s/db2inst1_gid/$db2uid/g  $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-	sed -i s/db2inst1_homedir/$DB2_USER/g $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-	sed -i s/db2inst1_password/$DB2_USER_PW/g $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-
-	db2fenid=`id db2fenc1 | cut -d"=" -f2 | cut -d"(" -f1`
-	sed -i s/db2fenc1_uid/$db2fenid/g  $CHARM_DIR/files/archives/db2installresfile/$rsp_file	
-	sed -i s/db2fenc1_gid/$db2fenid/g  $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-	dasuid=`id dasusr1 | cut -d"=" -f2 | cut -d"(" -f1`
-	sed -i s/das_uid/$dasuid/g $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-	sed -i s/das_gid/$dasuid/g $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-
-}
-# Create the Required user for DB2
-
-create_user()
-{
-	passwdchanged=0
-	instance_exists=0
-	db2_inst=`is_db2_installed`
-	if  [ $db2_inst == True ]; then
-		status-set maintenance "Creating Users"
-		#Find the group id for db2inst1 user which is used to install db2 and find all
-		#all users belonging to this user
-		db2inst1grpid=`id $DB2_USER |  cut -d" " -f2`
-		cfgusername=`config-get db2_user`
-		cfgpasswd=`config-get db2_pw`
-
-		#If user is not set, make "db2usr1" as default user
-		if [ "cfgusername" == "" ]; then
-			cfgusername="db2usr1"
-		fi
-
-		#If password is not set, make "password" as default password
-		if [ "cfgpasswd" == "" ]; then
-			cfgpasswd="db2usr123"
-		fi
-
-		#If the user is already available, just change the password.
-		for queue2 in `awk -F':' '{ print $1}' /etc/passwd`;
-		do
-			gid=`id $queue2 |  cut -d" " -f2`
-			if [ $gid == $db2inst1grpid ]; then
-				if [ $queue2 != "$DB2_USER" ]; then
-					if [ $cfgusername == $queue2  ]; then
-						juju-log "IBM DB2: Changing the password for the user $cfgusername to $cfgpasswd"
-						echo $cfgusername:$cfgpasswd | chpasswd
-						passwdchanged=1
-						juju-log "IBM DB2: Changed the password for the user $cfgusername to $cfgpasswd"
-					fi
-
-				fi
-			fi
-		done
-		#If not available, add a new user
-		if [ $passwdchanged != 1 ]; then
-			juju-log "IBM DB2: Creating New user"
-			create_newuser
-			juju-log "IBM DB2: Created New user"
-			juju-log $cfgusername
-		fi
-		#Creating a new instance for the new user if not existing
-
-		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
-		do
-			if [ $queue1 == $cfgusername ]; then
-				instance_exists=1
-			fi
-		done
-		if [ $instance_exists != 1 ]; then
-			juju-log "IBM DB2: Creating new instance for the user"
-			/opt/ibm/db2/V10.5/instance/db2icrt -u $cfgusername $cfgusername 
-			if [ $? == 0 ]; then
-				juju-log "IBM DB2: Created new instance for the user"
-			else	
-				juju-log "Creation of new instance failed"
-				exit 0
-			fi
-		fi
-
-		#Do the configuration for the new instance created
-		new_port=50001
-		free_port=0
-		is_free=0
-		#Check whether the port number is already in etc/services file, and then add it
-		cd /etc
-		if grep -q "db2c_$cfgusername" services
-		then
-			juju-log "IBM DB2: Services file already updated"
-		else
-			while [ $free_port == 0 ]
-			do
-				is_free=`netstat -lnp | grep $new_port | cut -d":" -f2 | cut -d" " -f1`
-				if [ "$is_free" != "$new_port" ]; then
-					free_port=1
-				else
-					new_port=$((new_port+1))
-				fi
-			done
-			juju-log "IBM DB2:Updating Services file"
-			echo "db2c_$cfgusername	$new_port/tcp" >> /etc/services
-			su - $cfgusername -c 'set db2instance=$cfgusername'
-			su - $cfgusername -c 'db2set DB2COMM=tcpip'
-			new_port=`echo $new_port | xargs`
-			su - $cfgusername -c 'db2 update dbm cfg using svcename '$new_port
-			/opt/ibm/db2/V10.5/instance/db2iupdt $cfgusername
-		fi
-		cd -	
-
-		#Start DB for the new user 
-		if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername;
-		then
-			juju-log "IBM DB2: Db2 already started for the user $cfgusername"
-		else
-			su - $cfgusername -c 'db2start'
-			juju-log "IBM DB2: DB2 is started"
-		fi
-		juju-log " After db2start"
-
-	else
-		juju-log "IBM DB2: DB2 is not installed. Install DB2 before creating users"
-		exit 0
-
-	fi
-}
-create_newuser()
-{
-	cfgusername=`config-get db2_user`
-	cfgpasswd=`config-get db2_pw`
-	dbcreated="False"
-	#Add the new user 
-	useradd -g db2grp1 -G dasadm1 -m $cfgusername
-	if [ $? != 0 ]; then
-		juju-log "IBM DB2: Addition of user $queue2 failed."
-		status-set blocked "Addition of new used failed, Try again"
-		exit 0
-	fi
-	#Set the password for the new user
-	echo $cfgusername:$cfgpasswd | chpasswd
-	if [ $? != 0 ]; then
-		juju-log "IBM DB2: Setting password for user $queue2 failed."
-		status-set blocked "Setting the password for user failed, Try again"
-		exit 0
-	fi
-	#Check whether test DB is already existing. If not create it
-	dbname=`su - $DB2_USER -c 'db2 list db directory' | grep "Database name" | grep -i "\bTEST\b" | cut -d"=" -f2`
-	dbname=`echo $dbname | xargs`
-	if [ "$dbname" != "TEST" ]; then
-		juju-log "IBM DB2: Creating DB Test"
-		su - $DB2_USER -c 'db2 create database test'
-		if [ $? != 0 ]; then
-			juju-log "IBM DB2: DB creation failed"
-			status-set blocked "DB creation failed, Try again"
-			exit 0
-		fi
-		juju-log "IBM DB2: Created DB Test"
-	fi
-	#Connect to the DB and grant data access 
-	su - $DB2_USER -c 'db2 connect to test;db2 grant dataaccess on database to user '$cfgusername
-	if [ $? != 0 ]; then
-		juju-log "IBM DB2: Grant access failed"
-		status-set blocked "Grant dataaccess on database failed, Try again"
-		exit 0
-	fi
-
-	su - $DB2_USER -c 'db2 connect to test;db2 disconnect test'
-	if [ $? != 0 ]; then
-		juju-log "IBM DB2: Disconnect DB failed"
-		status-set blocked "Disconnect DB failed"
-		exit 0
-	fi
-
-}
-#Check the package integrity after download
-check_pkg_integrity()
-{
-	SHA=`config-get sha`
-	pkg_name=`ls  $ARCHIVE_DIR/*.gz`
-
-	if [ "$SHA" == "" ]; then
-		juju-log "IBM DB2: Please provide valid sha value for your package."
-		status-set blocked "Please provide valid sha value for your package"
-		exit 0
-	elif [ "$SHA" != "`sha1sum $pkg_name | cut -d" " -f1`" ]; then
-		juju-log "IBM DB2: IBM DB2 package is corrupt."
-		status-set maintenance "IBM DB2 package is corrupt"
-		exit 1
-	fi
-}
-
-juju-log "IBM DB2: Begin config-change hook"
-db2_license_accepted=`config-get accept-ibm-db2-license`
-
-# Remove DB2 if license not accepted and exit. Else install it
-remove_unaccepted_software $db2_license_accepted
-if [ $db2_license_accepted == False ]; then
-	juju-log "IBM DB2: IBM DB2 License not accepted."
-elif [ $db2_license_accepted == True ]; then
-	juju-log "IBM DB2: License accepted"
-	db2_inst=`is_db2_installed`
-	#download db2
-	status-set maintenance "Downloading the IBM DB2 package for deployment"
-	download_db2
-	status-set maintenance "Checking whether download was successful"
-	#Install if download succeeded
-	if  [ $db2_inst == False ]; then
-		if [ -f  $ARCHIVE_DIR/*.gz ]; then
-			#Check the integrity of the downloaded package
-			check_pkg_integrity
-
-			cd $CHARM_DIR/files/archives
-			tar -zxvf $ARCHIVE_DIR/*.gz
-			if [ $? != 0 ]; then
-				juju-log "IBM DB2: Unable to extract the DB2 package content. Verify whether the package is corrupt."
-				status-set maintenance " Unable to extract the DB2 package content"
-				#Remove corrupt archive file
-				rm -rf $ARCHIVE_DIR/*.gz
-				exit 0
-			fi
-			if [ "$ARCHITECTURE" = "x86_64" ]; then
-				rsp_file=db2server.rsp
-			else
-				rsp_file=db2server_ppcle.rsp
-			fi
-			edit_responsefile
-			cd $CHARM_DIR/files/archives/server*
-
-			juju-log "IBM DB2: Checking etc/hosts file."
-			private_address=`unit-get private-address`
-			juju-log "private_address : $private_address"
-			cd /etc
-			if grep -q "$private_address" hosts
-			then
-				juju-log "IBM DB2: Host file already updated"
-			else
-				juju-log "IBM DB2:Updating Host file"
-				echo "$private_address `hostname`" >> /etc/hosts
-			fi
-			juju-log "IBM DB2: Installing db2 package."
-			status-set maintenance "Installing IBM DB2"
-			cd -
-			./db2setup -r $CHARM_DIR/files/archives/db2installresfile/$rsp_file
-			juju-log "IBM DB2: Installation of db2 complete."
-			# Configure system values  for Db2
-			#configure_system
-		fi
-	fi
-	# Configure system values  for Db2
-	configure_system
-	#Create the required user to connect to db2
-	create_user
-	#Configure DFTDBPATH
-	configure_dftdbpath
-	juju-log "After Configure dftd"
-	status-set active "IBM DB2 Installed"
-	$CHARM_DIR/hooks/start
-	juju-log "After calling start"
-else
-	juju-log "IBM DB2: Acceptable values for license is 'True' or 'False'"
-
-fi
-juju-log "IBM DB2: End config-change hook"
-
-
+#!/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/db-relation-broken'
--- hooks/db-relation-broken	1970-01-01 00:00:00 +0000
+++ hooks/db-relation-broken	2016-07-14 17:53:24 +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/db-relation-changed'
--- hooks/db-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/db-relation-changed	2016-07-14 17:53:24 +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/db-relation-departed'
--- hooks/db-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/db-relation-departed	2016-07-14 17:53:24 +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()
 
=== modified file 'hooks/db-relation-joined'
--- hooks/db-relation-joined	2016-01-12 08:17:38 +0000
+++ hooks/db-relation-joined	2016-07-14 17:53:24 +0000
@@ -1,14 +1,19 @@
-#!/bin/sh
-
-set -e
-DB2_USER=db2inst1
-CFGUSERNAME=`config-get db2_user`
-CFGPASSED=`config-get db2_pw`
-
-service_name=`su - $CFGUSERNAME -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
-PORT_NUM=`grep $service_name /etc/services | cut -d"/" -f1 | cut -f2`
-#remove white space
-PORT_NUM=`echo $PORT_NUM | xargs`
-
-relation-set hostname=`unit-get private-address` port=$PORT_NUM dbusername=$CFGUSERNAME dbuserpw=$CFGPASSED db2_instance_name=$CFGUSERNAME db2_install_path=$DB2_INSTALL_PATH
+#!/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/hook.template'
--- hooks/hook.template	1970-01-01 00:00:00 +0000
+++ hooks/hook.template	2016-07-14 17:53:24 +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()
 
=== modified file 'hooks/install'
--- hooks/install	2016-01-12 08:17:38 +0000
+++ hooks/install	2016-07-14 17:53:24 +0000
@@ -1,62 +1,19 @@
-#!/bin/bash
-
-set -e
-juju-log "IBM DB2: Begin Install."
-
-# Get the architecture from the uname command.
-ARCHITECTURE=`uname -m`
-apt-get update
-status-set maintenance "Installing pre requisites for IBM DB2"
-
-juju-log "IBM DB2: Installing binutils"
-apt-get install binutils
-juju-log "IBM DB2: Installed binutils"
-
-ARCHITECTURE=`uname -m`
-if [ "$ARCHITECTURE" != "x86_64" -a "$ARCHITECTURE" != "ppc64le" ]; then
-        juju-log "IBM DB2: Unsupported platform. IBM DB2 installed with this Charm supports only the x86_64 and POWER LE (ppc64le) platforms."
-        exit 1
-fi
-
-if [ "$ARCHITECTURE" == "x86_64" ]; then
-        juju-log "IBM DB2: Installing 32 bit libstdc++.so.6"
-        apt-get update
-        apt-get install lib32stdc++6 -y
-        juju-log "IBM DB2: Installed 32 bit libstdc++.so.6"
-fi
-if [ "$ARCHITECTURE" == "ppc64le" ]; then
-        juju-log "IBM DB2:  Installing libnuma package for POWER LE (ppc64le) platforms."
-        apt-get install libnuma-dev -y
-        #Installing XL compiler runtime packages for Linux on Power as this is one of the prerequisite software/configuration requirements
-        echo "deb http://public.dhe.ibm.com/software/server/POWER/Linux/rte/xlcpp/le/ubuntu $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/ibm-xlcpp-rte.list
-        apt-get update
-        apt-get install libxlc -y --force-yes
-        juju-log "IBM DB2:  Installed libnuma package for POWER LE (ppc64le) platforms."
-fi
-
-# Install expect
-juju-log "IBM DB2: Installng expect package"
-apt-get install -y expect
-juju-log "IBM DB2: Installed expect package"
-
-#create the userids required for db2 installation
-DB2_USER=db2inst1
-DB2_USER_PW=db2inst1
-
-juju-log "IBM DB2: Creating the user ids for db2 installation"
-groupadd db2grp1
-groupadd dasadm1
-groupadd db2fgrp1
-
-useradd -g db2grp1 -G dasadm1 -m $DB2_USER
-echo $DB2_USER:$DB2_USER_PW | chpasswd
-
-useradd -g dasadm1 -G db2grp1 -m dasusr1
-echo dasusr1:dasusr1 | chpasswd
-
-useradd -g db2fgrp1 -m db2fenc1
-echo db2fenc1:db2fenc1 | chpasswd
-
-juju-log "IBM DB2: Created the user ids for db2 installation"
-juju-log "IBM DB2: End Install hook"
-
+#!/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-elected'
--- hooks/leader-elected	1970-01-01 00:00:00 +0000
+++ hooks/leader-elected	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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 directory 'hooks/relations'
=== added directory 'hooks/relations/db2'
=== added file 'hooks/relations/db2/README.md'
--- hooks/relations/db2/README.md	1970-01-01 00:00:00 +0000
+++ hooks/relations/db2/README.md	2016-07-14 17:53:24 +0000
@@ -0,0 +1,66 @@
+# Overview
+
+This interface layer handles the communication between IBM DB2 and Consumer
+charms. The provider end of this interface provides the IBM DB2 service. The
+consumer part requires the existence of a provider to function.
+
+## Usage
+
+### Provides
+
+This interface layer will set the following states, as appropriate:
+
+- `{relation_name}.connected`: The relation is established, but IBM DB2 may not
+yet have provided any connection or service information.
+
+- `{relation_name}.sshconfigured`: A consumer ssh key has been added to the
+IBM DB2 `authorized_keys` file.
+
+- `{relation_name}.ready`: IBM DB2 has established relation with the consumer
+charm and the SSH key has been exchanged. DB2 has provided its connection
+string information, and is ready to accept requests from the consumer.
+
+- `{relation_name}.departed`: The relation has been removed. Any cleanup
+related to the consumer charm should happen now on the IBM DB2 charm since the
+consumer is going away.
+
+
+### Requires
+
+Consumers like WAS, Mobile First Server, etc require this interface to connect
+to IBM DB2. This interface layer will set the following states, as appropriate:
+
+- `{relation_name}.connected`: The consumer charm has been related to IBM DB2.
+At this point, the consumer charm sends the SSH key to IBM DB2 charm.
+
+    For example, the consumer charm can send the ssh key to IBM DB2 charm as follows:
+
+    ```
+    @when 'db.connected'
+    @when_not 'db.sshconfigured'
+    function configure_sshkeys_dbs() {
+        SSH_PATH=/root/.ssh
+        if [ ! -f  $SSH_PATH/id_rsa.pub ]; then
+                juju-log "Setting up SSH keys."
+                ssh-keygen -t rsa -f $SSH_PATH/id_rsa -N ''
+        fi
+        key="`cat $SSH_PATH/id_rsa.pub`"
+        relation_call --state=db.connected set_ssh_keys "$key" || true
+    }
+    ```
+
+-  `{relation_name}.ready`: IBM DB2 is ready to send connection information.
+The consumer charm can access the IBM DB2 details from the interface using the
+following methods:
+
+   - get_db2_hostname() - host name of IBM DB2
+   - get_db2_port() - port number of IBM DB2
+   - get_db2_path() - the install location of IBM DB2
+   - get_dbusername() - User name created for the consumer service to connect to DB2
+   - get_dbuserpw() - Password for connecting to DB2
+   - get_db2_instance_name() - Instance name created for the consumer service
+
+
+- `{relation_name}.departed`: The relation has been removed. Any cleanup
+related to IBM DB2 should happen now on the consumer charm since IBM DB2 is
+going away.
 
=== added file 'hooks/relations/db2/__init__.py'
=== added file 'hooks/relations/db2/interface.yaml'
--- hooks/relations/db2/interface.yaml	1970-01-01 00:00:00 +0000
+++ hooks/relations/db2/interface.yaml	2016-07-14 17:53:24 +0000
@@ -0,0 +1,4 @@
+name: db2
+summary: Facilitates communication between IBM DB2 and database consumers
+version: 1
+maintainer: "IBM Juju Support Team <[e-mail]>"
 
=== added file 'hooks/relations/db2/provides.py'
--- hooks/relations/db2/provides.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/db2/provides.py	2016-07-14 17:53:24 +0000
@@ -0,0 +1,80 @@
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class db2Provides(RelationBase):
+    # Every unit connecting will get the same information
+    scope = scopes.SERVICE
+    # convenient way to provide accessor methods
+    auto_accessors = ['db2_path', 'db2_port']
+
+    @hook('{provides:db2}-relation-joined')
+    def joined(self):
+        conversation = self.conversation()
+        conversation.remove_state('{relation_name}.departed')
+        conversation.set_state('{relation_name}.connected')
+
+    @hook('{provides:db2}-relation-changed')
+    def changed(self):
+        conversation = self.conversation()
+        conversation.remove_state('{relation_name}.departed')
+        conversation.set_state('{relation_name}.connected')
+        if str(conversation.get_remote('ssh_key')) != "None":
+            conversation.set_state('{relation_name}.ready')
+
+    @hook('{provides:db2}-relation-departed')
+    def departed(self):
+        conversation = self.conversation()
+        conversation.remove_state('{relation_name}.connected')
+        conversation.remove_state('{relation_name}.ready')
+        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')
+        conversation.remove_state('{relation_name}.ready')
+
+    def set_db_details(self, service, db2_path, db2_port, hostname,
+                       dbusername, dbuserpw, db2_instance_name, dbs_created):
+        conversation = self.conversation(service)
+        conversation.set_remote(data={
+            'db2_ready': True,
+            'db2_path': db2_path,
+            'db2_port': db2_port,
+            'hostname': hostname,
+            'dbusername': dbusername,
+            'dbuserpw': dbuserpw,
+            'db2_instance_name': db2_instance_name,
+            'dbs_created': dbs_created,
+        })
+
+    def set_sshconfigured(self, service):
+        conversation = self.conversation(service)
+        conversation.set_state('{relation_name}.sshconfigured')
+
+    def dismiss_sshconfigured(self, service):
+        conversation = self.conversation(service)
+        conversation.remove_state('{relation_name}.sshconfigured')
+
+    def get_sshkeys(self, service):
+        conversation = self.conversation(service)
+        return conversation.get_remote('ssh_key')
+
+    def get_dbnames(self, service):
+        conversation = self.conversation(service)
+        return conversation.get_remote('db_names')
+
+    def services(self):
+        """
+        Return a list of services requesting databases.
+        """
+        service = []
+        for conversation in self.conversations():
+            service.append(conversation.scope)
+        return service
 
=== added file 'hooks/relations/db2/requires.py'
--- hooks/relations/db2/requires.py	1970-01-01 00:00:00 +0000
+++ hooks/relations/db2/requires.py	2016-07-14 17:53:24 +0000
@@ -0,0 +1,65 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
+
+
+class db2Requires(RelationBase):
+    scope = scopes.GLOBAL
+    auto_accessors = ['ssh_key']
+
+    @hook('{requires:db2}-relation-joined')
+    def joined(self):
+        self.remove_state('{relation_name}.departed')
+        self.set_state('{relation_name}.connected')
+
+    @hook('{requires:db2}-relation-changed')
+    def changed(self):
+        self.remove_state('{relation_name}.departed')
+        self.set_state('{relation_name}.connected')
+        if str(self.get_remote('db2_port')) != "None":
+            self.set_state('{relation_name}.ready')
+
+    @hook('{requires:db2}-relation-departed')
+    def departed(self):
+        self.remove_state('{relation_name}.connected')
+        self.remove_state('{relation_name}.ready')
+        self.set_state('{relation_name}.departed')
+
+    def get_db2_port(self):
+        return self.get_remote('db2_port')
+
+    def get_db2_path(self):
+        return self.get_remote('db2_path')
+
+    def get_db2_hostname(self):
+        return self.get_remote('hostname')
+
+    def get_dbusername(self):
+        return self.get_remote('dbusername')
+
+    def get_dbuserpw(self):
+        return self.get_remote('dbuserpw')
+
+    def get_db2_instance_name(self):
+        return self.get_remote('db2_instance_name')
+
+    def get_db2_dbnames(self):
+        return self.get_remote('dbs_created')
+
+    def set_ssh_keys(self, ssh_key):
+        self.set_remote('ssh_key', ssh_key)
+
+    def set_dbs(self, db_names):
+        self.set_remote('db_names', db_names)
 
=== modified file 'hooks/start'
--- hooks/start	2016-01-12 08:17:38 +0000
+++ hooks/start	2016-07-14 17:53:24 +0000
@@ -1,48 +1,19 @@
-#!/bin/bash
-
-
-set -e
-juju-log "IBM DB2: Begin Start hook"
-DB2_USER=db2inst1
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
-cfgusername=`config-get db2_user`
-#If user is not set, make "db2usr1" as default user
-if [ "cfgusername" == "" ]; then
-	cfgusername="db2usr1"
-fi
-
-if [ -d $DB2_INSTALL_PATH/bin ]; then
-	service_name=`su - $DB2_USER -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
-	PORT_NUM=`grep $service_name /etc/services | cut -d"/" -f1 | cut -f2`
-	#remove white space
-	PORT_NUM=`echo $PORT_NUM | xargs`
-	if su - $DB2_USER -c 'netstat -an | grep '$PORT_NUM;
-	then
-		juju-log "IBM DB2: DB2 already running on port $PORT_NUM for the instance $DB2_USER"
-	else
-		su - db2inst1 -c 'db2start'
-		if su - $DB2_USER -c 'netstat -an | grep '$PORT_NUM;
-		then
-			juju-log "IBM DB2: DB2 started on port $PORT_NUM for the instance $DB2_USER"
-		else
-			juju-log "IBM DB2: DB2 not started on port $PORT_NUM for the instance $DB2_USER"
-			exit 1
-		fi
-	fi
-	#Start the service for the db2 user configured
-	if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername
-	then
-		juju-log "IBM DB2: DB2 already running for the instance $cfgusername"
-	else
-		su - $cfgusername -c 'db2start'
-		if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername
-		then
-			 juju-log "IBM DB2: DB2 started for the instance $cfgusername"
-		else
-			juju-log "IBM DB2: DB2 not started for the instance $cfgusername"
-			exit 1
-		fi
-	fi
-fi	
-			
-juju-log "IBM DB2: End Start hook"
+#!/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()
 
=== modified file 'hooks/stop'
--- hooks/stop	2016-01-12 08:17:38 +0000
+++ hooks/stop	2016-07-14 17:53:24 +0000
@@ -1,30 +1,19 @@
-#!/bin/bash
-
-set -e
-juju-log "IBM DB2: Begin Stop hook"
-DB2_USER=db2inst1
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
-if [ -d $DB2_INSTALL_PATH/bin ]; then
-	service_name=`su - $DB2_USER -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
-	PORT_NUM=`grep $service_name /etc/services | cut -d"/" -f1 | cut -f2`
-	#remove white space
-	PORT_NUM=`echo $PORT_NUM | xargs`
-	if su - $DB2_USER -c 'netstat -an | grep '$PORT_NUM;
-	then
-		su - db2inst1 -c 'db2stop'
-		juju-log "IBM DB2: DB2 stopped for the instance $DB2_USER"
-	else
-		juju-log "IBM DB2: DB2 is already stopped for the instance $DB2_USER"
-	fi
-	
-	#Stopping for the db2 user configured
-	if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername
-        then
-		su - $cfgusername -c 'db2stop'
-		juju-log "IBM DB2: DB2 stopped for instance $cfgusername"
-	else
-		juju-log "IBM DB2: DB2 is already stopped for the instance $cfgusername"
-	fi
-		
-fi
-juju-log "IBM DB2: End Stop hook"
+#!/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/update-status'
--- hooks/update-status	1970-01-01 00:00:00 +0000
+++ hooks/update-status	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +0000
@@ -0,0 +1,22 @@
+"includes":
+- "layer:basic"
+- "layer:apt"
+- "layer:leadership"
+- "layer:basic"
+- "layer:ibm-base"
+- "interface:db2"
+"options":
+  "basic":
+    # Setting options for the basic layer.
+    "packages":
+    - "curl"
+    - "binutils"
+    - "pwgen"
+    - "tar"
+    "use_venv": !!bool "false"
+    "include_system_packages": !!bool "false"
+  "ibm-base": {}
+  "leadership": {}
+  "ibm-db2": {}
+"repo": "bzr+ssh://bazaar.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-db2/trunk/"
+"is": "ibm-db2"
 
=== 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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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.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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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-07 02:57:11 +0000
+++ metadata.yaml	2016-07-14 17:53:24 +0000
@@ -1,14 +1,21 @@
-name: ibm-db2
-summary: IBM DB2
-maintainer: IBM Juju Support Team <[e-mail]>
-description: |
-  IBM DB2 Enterprise Server Edition provides scalable database server software to handle the demanding workloads of large and midsize enterprise servers. 
-tags:
-  - misc
-  - database
-  - ibm 
-subordinate: false
-provides:
- db:
-    interface: db2
-
+"name": "ibm-db2"
+"summary": "IBM DB2 Product"
+"maintainer": "IBM Juju Support Team <[e-mail]>"
+"description": |
+  IBM DB2 Enterprise Server Edition provides scalable database server software to handle the demanding workloads of large and midsize enterprise servers.
+"tags":
+- "ibm"
+- "apt"
+- "leadership"
+- "ibm"
+- "db2"
+- "database"
+- "misc"
+"provides":
+  "db":
+    "interface": "db2"
+"min-juju-version": "2.0-beta1"
+"series":
+- "trusty"
+- "xenial"
+"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	2016-07-14 17:53:24 +0000
@@ -0,0 +1,112 @@
+# 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.
+'''
+from charmhelpers import fetch
+from charmhelpers.core import hookenv
+from charms import layer
+from charms import reactive
+from charms.reactive import when, when_not
+
+import charms.apt
+# Aliases for backwards compatibility
+from charms.apt import add_source, queue_install, installed, purge
+
+
+__all__ = ['add_source', 'update', 'queue_install', 'install_queued',
+           'installed', 'purge', 'ensure_package_status']
+
+
+@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 configure_sources():
+    """Add user specified package sources from the service configuration.
+
+    See charmhelpers.fetch.configure_sources for details.
+    """
+    hookenv.log('Initializing Apt Layer')
+    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:
+        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]:
+            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(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	2016-07-14 17:53:24 +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-db2.sh'
--- reactive/ibm-db2.sh	1970-01-01 00:00:00 +0000
+++ reactive/ibm-db2.sh	2016-07-14 17:53:24 +0000
@@ -0,0 +1,799 @@
+#!/bin/bash
+set -e
+
+source charms.reactive.sh
+
+ARCHITECTURE=`uname -m`
+ARCHIVE_DIR=$CHARM_DIR/files/archives
+DB2_ARCHIVE_DIR=`pwd`
+DB2_USER=db2inst1
+DB2_USER_PW=`pwgen -N 1 15`
+DB2_DAS_USER=dasusr1
+DB2_DAS_USER_PW=`pwgen -N 1 15`
+DB2_FENCE_USER=db2fenc1
+DB2_FENCE_USER_PW=`pwgen -N 1 15`
+DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
+AUTH_KEY_FILE=/root/.ssh/authorized_keys
+TEMP_KEY_FILE=key.txt
+
+cfgusername=""
+
+remoteunit=$cfgusername
+cfgpasswd=""
+dbs_created=""
+
+isdbcreated=0
+#Get the cfguser name based on the remote unit name
+get_cfgusername()
+{
+	usr="usr"
+	passwd=`pwgen -N 1 15`
+	db="db"
+	cfgusername=$1
+	cfgusername=`echo $cfgusername | cut -d"/" -f1`
+	cfgusername=`echo "$cfgusername" | sed -r 's/-//g' | sed -r 's/ibm//g'`
+	cfgusername=`echo "$cfgusername" | awk '{print substr($0,0,5)}'`
+	remoteunit=$cfgusername
+	cfgusername="$cfgusername$usr"
+	cfgpasswd="$cfgusername$passwd"
+	remoteunitdbname="$remoteunit$db"
+
+}
+# Check whether DB2 is installed
+is_db2_installed()
+{
+	if [ -d $DB2_INSTALL_PATH/bin ]; then
+		echo "True"
+	else
+		echo "False"
+	fi
+}
+
+
+# Remove DB2, if installed
+remove_software()
+{
+	db2_inst=`is_db2_installed`
+	if  [ $db2_inst == "True" ]; then
+		juju-log "IBM DB2: Removing IBM DB2 software."
+		status-set maintenance "Removing IBM DB2"
+
+		#finding the DB alias names to be dropped and dropping all Databases in that
+		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
+		do
+			juju-log "IBM DB2: Dropping the Databases for the instance $queue1"
+			#if db2 is not running, we need to start it first, otherwise db2 drop command will fail
+			if su - $queue1 -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$queue1;
+			then
+				juju-log "IBM DB2: DB2 already started for the user $queue1"
+			else
+				su - $queue1 -c 'db2start'
+				juju-log "IBM DB2: DB2 is started"
+			fi
+
+			for queue in `su - $queue1 -c 'db2 list db directory | grep "Database alias" | cut -d"=" -f2'`;
+			do
+				queue=`echo $queue | xargs`
+				juju-log "IBM DB2: Dropping the DB $queue"
+				su - $queue1 -c 'db2 drop database '$queue
+				if [ $? -eq 0 ]; then
+					juju-log "IBM DB2: Dropped the DB $queue"
+				else
+					juju-log "IBM DB2: Dropping the DB $queue failed"
+					status-set blocked "Dropping the DB failed"
+					exit 0
+				fi
+			done
+			juju-log "IBM DB2: Stopping the DB for $queue1"
+
+			if su - $queue1 -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$queue1
+			then
+				su - $queue1 -c 'db2 force application all'
+				su - $queue1 -c 'db2stop'
+				if [ $? -eq 0 ]; then
+					juju-log "IBM DB2: Stopped the DB for the instance $queue1"
+				else
+					juju-log "IBM DB2: Stopping the DB for $queue1 failed"
+					status-set blocked "Stopping the DB for $queue1 failed"
+					exit 0
+				fi
+
+			else
+				juju-log "IBM DB2: DB2 is already stopped"
+			fi
+		done
+
+		#drop the das
+		cd $DB2_INSTALL_PATH/instance
+		juju-log "IBM DB2: Dropping the DAS"
+		./dasdrop
+		if [ $? -eq 0 ]; then
+			juju-log "IBM DB2: Dropped the DAS"
+		else
+			juju-log "IBM DB2: Dropping the DAS failed"
+			status-set blocked "Dropping the DAS failed"
+			exit 0
+		fi
+
+		#delete the instances
+		su - $DB2_USER -c 'db2ilist'
+		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
+		do
+			juju-log "IBM DB2: Deleting the instance $queue1"
+			$DB2_INSTALL_PATH/instance/db2idrop $queue1
+			if [ $? -eq 0 ]; then
+				juju-log "IBM DB2: Deleted  the instance $queue1"
+			else
+				juju-log "IBM DB2: Deleting the instance $queue1 failed"
+				status-set blocked "Deleting the instance $queue1 failed"
+				exit 0
+			fi
+
+		done
+
+		#Delete the instance entries from /etc/services file
+		juju-log "IBM DB2: Deleting the entries from /etc/services"
+		sed -i '/db2c_/d' /etc/services
+		if [ $? -eq 0 ]; then
+			juju-log "IBM DB2: Deleted the entries from /etc/services"
+		else
+			juju-log "IBM DB2: Deletion of the entries from /etc/services failed"
+			status-set blocked "Deletion of the entries from /etc/services failed"
+			exit 0
+		fi
+
+		#uninstall
+		juju-log "IBM DB2: Uninstall "
+		cd $DB2_INSTALL_PATH/install
+		set +e
+		./db2_deinstall -a
+		if [ $? -eq 0 ]; then
+			juju-log "IBM DB2: Uninstall of db2 successful"
+		else
+			juju-log "IBM DB2: Uninstall of db2 failed"
+			status-set blocked "IBM DB2 Uninstallation failed"
+			exit 0
+		fi
+		set -e
+		cd /opt/ibm
+		rm -rf db2
+		juju-log "IBM DB2: Finished Uninstalling......."
+		status-set blocked "IBM DB2 Uninstalled"
+
+	else
+		juju-log "IBM DB2: DB2 not installed"
+	fi
+
+}
+
+# Update system configuration after installing DB2
+configure_system()
+{
+	juju-log "IBM DB2: Updating system configuration."
+	cd $DB2_INSTALL_PATH/instance
+	su - $DB2_USER -c 'db2set DB2COMM=tcpip'
+
+	#Start DB for the DB2_user
+	if su - $DB2_USER -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$DB2_USER;
+	then
+		juju-log "IBM DB2: DB2 already started for the user $DB2_USER"
+	else
+		su - $DB2_USER -c 'db2start'
+		juju-log "IBM DB2: DB2 is started"
+	fi
+
+	service_name=`su - $DB2_USER -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
+	port_num=`grep $service_name /etc/services | cut -d"/" -f1 | cut -f2`
+	port_num=`echo $port_num | xargs`
+	if su - $DB2_USER -c 'netstat -an | grep '$port_num;
+	then
+		juju-log "IBM DB2: DB2 started on port $port_num"
+	else
+		juju-log "IBM DB2: DB2 not started on port $port_num"
+		exit 1
+	fi
+
+	juju-log "IBM DB2: Updated system configuration."
+
+}
+
+#Configure dftdbpath
+configure_dftdbpath()
+{
+	db2_inst=`is_db2_installed`
+	if  [ $db2_inst == "True" ]; then
+		cfgdbpath=`config-get dftdbpath`
+		#If null, assign the default value
+		if [ "cfgdbpath" == "" ]
+		then
+			cfgdbpath="/tmp"
+		fi
+
+		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
+		do
+			#if db2 is not running don't do anything
+			if su - $queue1 -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$queue1;
+			then
+				su - $queue1 -c 'db2 attach to '$queue1
+				dbpath=`su - $queue1 -c 'db2 get dbm cfg|grep -i DFTDBPATH|cut -d"=" -f2'`
+				cfgdbpath=`echo $cfgdbpath | xargs`
+				dbpath=`echo $dbpath | xargs`
+				if  [ "$cfgdbpath" != "$dbpath" ]; then
+					if [ -d "$cfgdbpath" ]; then
+						su - $queue1 -c 'db2 update dbm cfg using DFTDBPATH '$cfgdbpath
+						if [ $? -eq 0 ]; then
+							juju-log "IBM DB2: DFTDBPATH changed to $cfgdbpath"
+						else
+							juju-log "IBM DB2: Unable to set DFTDBPATH to $cfgdbpath"
+							exit 0
+						fi
+					else
+						juju-log "IBM DB2: Not a valid path. Please check the path and run the command again"
+						exit 0
+					fi
+				fi
+			fi
+		done
+	else
+		juju-log "IBM DB2: DB2 is not installed. Install DB2 to change the dbpath"
+		exit 0
+	fi
+}
+
+# Edit the response file for UID
+edit_responsefile()
+{
+	rsp_file=db2server_temp.rsp
+	if [ "$ARCHITECTURE" = "x86_64" ]; then
+		orgrsp_file=db2server.rsp
+	else
+		orgrsp_file=db2server_ppcle.rsp
+	fi
+	cp $CHARM_DIR/files/archives/$orgrsp_file $CHARM_DIR/files/archives/$rsp_file
+
+	db2uid=`id $DB2_USER | cut -d"=" -f2 | cut -d"(" -f1`
+	sed -i s/db2inst1_uid/$db2uid/g  $CHARM_DIR/files/archives/$rsp_file
+	sed -i s/db2inst1_gid/$db2uid/g  $CHARM_DIR/files/archives/$rsp_file
+	sed -i s/db2inst1_homedir/$DB2_USER/g $CHARM_DIR/files/archives/$rsp_file
+	sed -i s/db2inst1_password/$DB2_USER_PW/g $CHARM_DIR/files/archives/$rsp_file
+
+	db2fenid=`id $DB2_FENCE_USER | cut -d"=" -f2 | cut -d"(" -f1`
+	sed -i s/db2fenc1_uid/$db2fenid/g  $CHARM_DIR/files/archives/$rsp_file
+	sed -i s/db2fenc1_gid/$db2fenid/g  $CHARM_DIR/files/archives/$rsp_file
+
+	dasuid=`id $DB2_DAS_USER | cut -d"=" -f2 | cut -d"(" -f1`
+	sed -i s/das_uid/$dasuid/g $CHARM_DIR/files/archives/$rsp_file
+	sed -i s/das_gid/$dasuid/g $CHARM_DIR/files/archives/$rsp_file
+
+}
+
+create_user()
+{
+	servicename=$1
+	user_exists=0
+	instance_exists=0
+	db2_inst=`is_db2_installed`
+	get_cfgusername $servicename
+	if  [ $db2_inst == "True" ]; then
+		status-set maintenance "Creating DB user and instance"
+		#Find the group id for db2inst1 user which is used to install db2 and find all
+		#users belonging to this user
+		db2inst1grpid=`id $DB2_USER |  cut -d" " -f2`
+
+		#If the user is already available, just log the information.
+		for queue2 in `awk -F':' '{ print $1}' /etc/passwd`;
+		do
+			gid=`id $queue2 |  cut -d" " -f2`
+			if [ $gid == $db2inst1grpid ]; then
+				if [ $queue2 != "$DB2_USER" ]; then
+					if [ $cfgusername == $queue2  ]; then
+						juju-log "IBM DB2: User $cfgusername already exists"
+						user_exists=1
+					fi
+				fi
+			fi
+		done
+
+		#If not available, add a new user
+		if [ $user_exists -ne 1 ]; then
+			juju-log "IBM DB2: Creating New user"
+			create_newuser $servicename
+			juju-log "IBM DB2: Created New user"
+			juju-log $cfgusername
+		fi
+
+		#Creating a new instance for the new user if not existing
+		for queue1 in `su - $DB2_USER -c 'db2ilist'`;
+		do
+			if [ $queue1 == $cfgusername ]; then
+				juju-log "IBM DB2: Instance $cfgusername already exists"
+				instance_exists=1
+			fi
+		done
+		if [ $instance_exists -ne 1 ]; then
+			juju-log "IBM DB2: Creating new instance for the user"
+			$DB2_INSTALL_PATH/instance/db2icrt -u $cfgusername $cfgusername
+			if [ $? = 0 ]; then
+				juju-log "IBM DB2: Created new instance for the user"
+			else
+				juju-log "IBM DB2: Creation of new instance failed"
+				exit 0
+			fi
+		fi
+
+		#Do the configuration for the new instance created
+		new_port=50001
+		free_port=0
+		is_free=0
+		#Check whether the port number is already in etc/services file, and then add it
+		cd /etc
+		if grep -q "db2c_$cfgusername" services
+		then
+			juju-log "IBM DB2: Services file already updated"
+		else
+			while [ $free_port -eq 0 ]
+			do
+				is_free=`netstat -lnp | grep $new_port | cut -d":" -f2 | cut -d" " -f1`
+				if [ "$is_free" != "$new_port" ]; then
+					free_port=1
+				else
+					new_port=$((new_port+1))
+				fi
+			done
+			juju-log "IBM DB2:Updating Services file"
+			echo -e "db2c_$cfgusername	$new_port/tcp" >> /etc/services
+			su - $cfgusername -c 'set db2instance=$cfgusername'
+			su - $cfgusername -c 'db2set DB2COMM=tcpip'
+			new_port=`echo $new_port | xargs`
+				#port_num_consumer=$new_port
+			su - $cfgusername -c 'db2 update dbm cfg using svcename '$new_port
+			$DB2_INSTALL_PATH/instance/db2iupdt $cfgusername
+		fi
+		cd -
+
+		#Start DB for the new user
+		if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername;
+		then
+			juju-log "IBM DB2: DB2 already started for the user $cfgusername"
+		else
+			su - $cfgusername -c 'db2start'
+			juju-log "IBM DB2: DB2 is started"
+		fi
+		#set_state 'db.dbstarted'
+
+	else
+		juju-log "IBM DB2: DB2 is not installed. Install DB2 before creating users"
+		exit 0
+
+	fi
+	status-set active "Completed DB user and instance creation"
+}
+
+create_newuser()
+{
+	servicename=$1
+	dbcreated="False"
+	#Add the new user
+	get_cfgusername $servicename
+	useradd -g db2grp1 -G dasadm1 -m $cfgusername
+	if [ $? -ne 0 ]; then
+		juju-log "IBM DB2: Addition of user $queue2 failed."
+		status-set blocked "Addition of new used failed, Try again"
+		exit 0
+	fi
+	#Set the password for the new user
+	echo $cfgusername:$cfgpasswd | chpasswd
+	if [ $? -ne 0 ]; then
+		juju-log "IBM DB2: Setting password for user $queue2 failed."
+		status-set blocked "Setting the password for user failed, Try again"
+		exit 0
+	fi
+	#Check whether test DB already exists. If not create it
+
+	dbname=`su - $DB2_USER -c 'db2 list db directory' | grep "Database name" | grep -i "\bTEST\b" | cut -d"=" -f2`
+	dbname=`echo $dbname | xargs`
+	if [ "$dbname" != "TEST" ]; then
+		juju-log "IBM DB2: Creating DB Test"
+		su - $DB2_USER -c 'db2 create database test'
+		if [ $? -ne 0 ]; then
+			juju-log "IBM DB2: DB creation failed"
+			status-set blocked "DB creation failed, Try again"
+			exit 0
+		fi
+		juju-log "IBM DB2: Created DB Test"
+	fi
+	#Connect to the DB and grant data access
+	su - $DB2_USER -c 'db2 connect to test;db2 grant dataaccess on database to user '$cfgusername
+	if [ $? -ne 0 ]; then
+		juju-log "IBM DB2: Grant access failed"
+		status-set blocked "Grant dataaccess on database failed, Try again"
+		exit 0
+	fi
+	su - $DB2_USER -c 'db2 connect to test;db2 disconnect test'
+	if [ $? -ne 0 ]; then
+		juju-log "IBM DB2: Disconnect DB failed"
+		status-set blocked "Disconnect DB failed"
+		exit 0
+	fi
+
+}
+
+create_database()
+{
+	isdbcreated=0
+	dbtocreate=$1
+	servicename=$2
+	get_cfgusername $servicename
+	#create the db for $dbnametocreate if it doesn't exist
+	dbname=`su - $cfgusername -c 'db2 list db directory' | grep "Database name" | grep -i "\b$dbtocreate\b" | cut -d"=" -f2`
+	dbname=`echo $dbname | xargs`
+	dbname=`echo "$dbname" | awk '{ print tolower($1) }'`
+	dbtocreate=`echo "$dbtocreate" | awk '{ print tolower($1) }'`
+	#check whether dbname is more than 8 chars
+	if [ ${#dbtocreate} -gt 8 ]; then
+		juju-log "IBM DB2: Failed to create DB $dbtocreate. DB name should be <= 8 chars"
+		#status-set blocked "DB creation for $dbtocreate failed as it contains more than 8 chars"
+	else
+		if [ "$dbname" != "$dbtocreate" ]; then
+			juju-log "IBM DB2: Creating DB $dbtocreate"
+			su - $cfgusername -c 'db2 create database '$dbtocreate
+			if [ $? -ne 0 ]; then
+				juju-log "IBM DB2: DB creation failed"
+				status-set blocked "DB creation failed, Try again"
+				exit 0
+			fi
+			juju-log "IBM DB2: Created DB $dbtocreate"
+			isdbcreated=1
+		else
+			juju-log "IBM DB2: DB $dbtocreate already exists"
+		fi
+	fi
+}
+
+# Must be called from a 'db.ready' state handler
+create_dbs()
+{
+dbs_created=""
+servicename=$1
+dbnames=$(relation_call --state=db.ready get_dbnames $servicename) || true
+
+#If dbnames is null, create a default DB as per service name. Else create the DBs requested by the related charm
+if [ -z "$dbnames" -o "$dbnames" == "None" ] ; then
+	juju-log "IBM DB2: Creating a default DB $remoteunitdbname based on remote service name"
+	create_database $remoteunitdbname $servicename
+	if [ $isdbcreated -eq 1 ] ; then
+		dbs_created+=$remoteunitdbname
+		dbs_created+="."
+	fi
+else
+	juju-log "IBM DB2: Creating the DB names as passed by consumer"
+	if [ `echo $dbnames | grep -c "," ` -gt 0 ]
+	then
+		#parse the $dbnames string to get the names of dbs to be created
+		count=1
+		db_to_create="test"
+		while [ "$db_to_create" != "" ]
+		do
+			db_to_create=`echo $dbnames | cut -d"," -f$count`
+			juju-log "IBM DB2:db_to_create is $db_to_create"
+			if [ "$db_to_create" != "" ] ; then
+				create_database $db_to_create $servicename
+				juju-log "Created DB $db_to_create"
+				if [ $isdbcreated -eq 1 ] ; then
+					dbs_created+=$db_to_create
+					dbs_created+="."
+				fi
+			fi
+			((count=count+1))
+		done
+	else
+		create_database $dbnames $servicename
+		juju-log "Created DB $dbnames"
+		dbs_created+=$dbnames
+		dbs_created+="."
+	fi
+fi
+}
+
+remove_sshkeys()
+{
+	servicename=$1
+	#Read the key from the key.txt file and see whether it exists
+	if grep -q "$servicename" $TEMP_KEY_FILE
+	then
+	key=`cat $TEMP_KEY_FILE | grep $servicename | cut -d":" -f2`
+	grep -v "$key" $AUTH_KEY_FILE > tempfile.txt || touch tempfile.txt
+	mv tempfile.txt $AUTH_KEY_FILE
+	if grep -q "$key" $AUTH_KEY_FILE
+	then
+		juju-log "IBM DB2: SSH Key not deleted from $AUTH_KEY_FILE"
+	else
+		juju-log "IBM DB2: SSH Key deleted from $AUTH_KEY_FILE"
+	fi
+	#Remove from the temporary file as well
+	grep -v "$servicename:$key" $TEMP_KEY_FILE > tempfile1.txt
+	mv tempfile1.txt $TEMP_KEY_FILE
+	if grep -q "$key" $TEMP_KEY_FILE
+	then
+		juju-log "IBM DB2: SSH Key not deleted from $TEMP_KEY_FILE"
+	else
+		juju-log "IBM DB2: SSH Key deleted from $TEMP_KEY_FILE"
+	fi
+
+fi
+
+}
+
+
+@when_not 'config.set.license_accepted'
+function report_missing_license(){
+	juju-log "IBM DB2: license_accepted is not set."
+	status-set blocked "license_accepted must be set"
+}
+
+
+@when_not 'config.set.curl_url'
+function report_missing_curl(){
+	juju-log "IBM DB2: curl config options are not set."
+	status-set blocked "curl options must be set"
+}
+
+
+@when 'ibm-db2.installed'
+@when_not 'ibm-base.license.accepted'
+function uninstall(){
+	juju-log "IBM DB2: Removing IBM DB2 (if installed) as the license agreement is not accepted."
+	status-set maintenance "IBM DB2 is getting uninstalled"
+	remove_software
+	remove_state 'ibm-db2.installed'
+	status-set maintenance "IBM DB2 is uninstalled"
+	rm -rf $TEMP_KEY_FILE
+
+}
+
+#Setting the interface states after uninstall
+@when 'db.connected'
+@when_not 'ibm-db2.installed'
+function reset_interface_states(){
+	services=$(relation_call --state=db.connected services) || true
+	for service in $services; do
+		juju-log "IBM DB2: Resetting states for the service $service"
+		relation_call --state=db.connected dismiss_sshconfigured $service || true
+		relation_call --state=db.connected reset_states $service || true
+	done
+
+}
+
+
+@when_not 'ibm-db2.prereqsinstalled'
+function init() {
+	if [ "$ARCHITECTURE" != "x86_64" -a "$ARCHITECTURE" != "ppc64le" ]; then
+		juju-log "IBM DB2: Unsupported platform. IBM DB2 installed with this Charm supports only the x86_64 and POWER LE (ppc64le) platforms."
+		exit 1
+	fi
+	set -e
+	juju-log "IBM DB2: Begin Install."
+	status-set maintenance "Installing pre requisites for IBM DB2"
+	apt-get update
+
+	if [ "$ARCHITECTURE" == "x86_64" ]; then
+		juju-log "IBM DB2: Installing 32 bit libstdc++.so.6"
+		apt-get install lib32stdc++6 -y
+		juju-log "IBM DB2: Installed 32 bit libstdc++.so.6"
+	fi
+	if [ "$ARCHITECTURE" == "ppc64le" ]; then
+		juju-log "IBM DB2:  Installing libnuma package for POWER LE (ppc64le) platforms."
+		apt-get install libnuma-dev -y
+		#Installing XL compiler runtime packages for Linux on Power as this is one of the prerequisite software/configuration requirements
+		echo "deb http://public.dhe.ibm.com/software/server/POWER/Linux/rte/xlcpp/le/ubuntu $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/ibm-xlcpp-rte.list
+		apt-get update
+		apt-get install libxlc -y --force-yes
+		juju-log "IBM DB2:  Installed libnuma package for POWER LE (ppc64le) platforms."
+	fi
+
+	juju-log "IBM DB2: Creating the user ids for db2 installation"
+	groupadd db2grp1
+	groupadd dasadm1
+	groupadd db2fgrp1
+
+	useradd -g db2grp1 -G dasadm1 -m $DB2_USER
+	echo $DB2_USER:$DB2_USER_PW | chpasswd
+	useradd -g dasadm1 -G db2grp1 -m $DB2_DAS_USER
+	echo $DB2_DAS_USER:$DB2_DAS_USER_PW | chpasswd
+	useradd -g db2fgrp1 -m $DB2_FENCE_USER
+	echo $DB2_FENCE_USER:$DB2_FENCE_USER_PW | chpasswd
+
+	juju-log "IBM DB2: Created the user ids for db2 installation"
+	status-set maintenance "Installed pre requisites for IBM DB2"
+	set_state 'ibm-db2.prereqsinstalled'
+
+}
+
+
+@when 'ibm-db2.prereqsinstalled' 'ibm-base.license.accepted' 'ibm-base.curl.resource.fetched'
+@when_not 'ibm-db2.installed'
+function install() {
+	juju-log "IBM DB2: License accepted"
+	db2_inst=`is_db2_installed`
+	if [[ ! -d $ARCHIVE_DIR ]]; then
+		mkdir $ARCHIVE_DIR
+	fi
+	#Install if download succeeded
+	if  [ $db2_inst == "False" ]; then
+		if [ -f  $ARCHIVE_DIR/*.gz ]; then
+
+			cd $CHARM_DIR/files/archives
+			tar -zxvf $ARCHIVE_DIR/*.gz
+			if [ $? -ne 0 ]; then
+				juju-log "IBM DB2: Unable to extract the DB2 package content. Verify whether the package is corrupt."
+				status-set maintenance "Unable to extract the DB2 package content"
+				#Remove corrupt archive file
+				rm -rf $ARCHIVE_DIR/*.gz
+				exit 0
+			fi
+			if [ "$ARCHITECTURE" = "x86_64" ]; then
+				rsp_file=db2server.rsp
+			else
+				rsp_file=db2server_ppcle.rsp
+			fi
+			edit_responsefile
+			cd $CHARM_DIR/files/archives/server*
+			juju-log "IBM DB2: Edited the response file"
+
+			juju-log "IBM DB2: Checking etc/hosts file."
+			private_address=`unit-get private-address`
+			if grep -q "$private_address" /etc/hosts; then
+				juju-log "IBM DB2: Host file already updated"
+			else
+				juju-log "IBM DB2: Updating Host file"
+				echo "$private_address `hostname`" >> /etc/hosts
+			fi
+
+			juju-log "IBM DB2: Installing db2 package."
+			status-set maintenance "Installing IBM DB2"
+			./db2setup -r $CHARM_DIR/files/archives/$rsp_file
+			juju-log "IBM DB2: Installation of db2 complete."
+		fi
+	fi
+	# Configure system values  for Db2
+	configure_system
+	#Configure DFTDBPATH
+	configure_dftdbpath
+	echo "Tempory Key File" > $TEMP_KEY_FILE
+	set_state 'ibm-db2.installed'
+	status-set active "IBM DB2 Installed"
+}
+
+@when 'config.changed.dftdbpath'
+function configurevalues(){
+	configure_dftdbpath
+}
+
+@when 'ibm-db2.installed'
+@when_not 'db.connected'
+function report_waiting_on_consumers(){
+	status-set active "IBM DB2 Ready (waiting for consumers)"
+}
+
+@when 'ibm-db2.installed'
+@when 'db.connected'
+function configure_sshkeys(){
+	services=$(relation_call --state=db.connected services)
+	for service in $services; do
+		key=$(relation_call --state=db.connected get_sshkeys $service) || true
+		juju-log "IBM DB2: Received the ssh key $key from the service $service"
+
+		if [ "$key" == "None" ]; then
+			juju-log "IBM DB2: No data sent yet"
+			continue
+		fi
+
+		# Add the key to the authorized_keys file, if it exists
+		set +e
+		#Create a temp key file if it doesn't exist
+		if [ -f $TEMP_KEY_FILE ]; then
+			juju-log "IBM DB2: Temp file already exists"
+		else
+			echo "Temp Key File" > $TEMP_KEY_FILE
+		fi
+		if [ -f $AUTH_KEY_FILE ]; then
+			# Append only if the key is not present
+			juju-log "IBM DB2: Updating the key file"
+			grep "$key" $AUTH_KEY_FILE > /dev/null
+			if [ $? -ne 0 ]; then
+				juju-log "IBM DB2: Updating authorized keys file"
+				echo "$key" >> $AUTH_KEY_FILE
+				echo "$service:$key" >> $TEMP_KEY_FILE
+			else
+				juju-log "IBM DB2: Key already present"
+			fi
+		else
+			juju-log "IBM DB2: Creating authorized keys file"
+			echo "$key" > $AUTH_KEY_FILE
+			echo "$service:$key" > $TEMP_KEY_FILE
+		fi
+		relation_call --state=db.connected set_sshconfigured $service || true
+		juju-log "IBM DB2: Completed updating the authorized key"
+		set -e
+	done
+}
+
+@when 'ibm-db2.installed'
+@when 'db.ready'
+@when 'db.sshconfigured'
+function create_consumer_dbs(){
+	services=$(relation_call --state=db.ready services)
+	for service in $services; do
+
+		key=$(relation_call --state=db.ready get_sshkeys $service) || true
+                juju-log "IBM DB2: In create_consumer_dbs function, Received the ssh key $key from the service $service"
+
+                if [ "$key" == "None" ]; then
+                        juju-log "IBM DB2: No data sent yet"
+                        continue
+                fi
+
+
+		#Create the user for the remote unit connected
+		juju-log "IBM DB2: Creating the users for the consumer $service"
+		create_user $service
+		juju-log "IBM DB2: Create users completed"
+
+		#Create the DBs after parsing
+		juju-log "IBM DB2: Creating DBs for the consumer $service"
+		create_dbs $service
+		juju-log "IBM DB2: Create DBs completed"
+
+		# If we created a new db, send relation data. Otherwise, the db already
+		# existed, so there is no need to send the data.
+		if [ $isdbcreated -eq 1 ] ; then
+			get_cfgusername $service
+			service_name=`su - $cfgusername -c 'db2 get dbm cfg|grep -i svce|cut -d"=" -f2'`
+			db2_port=`grep $service_name /etc/services | cut -d"/" -f1 | grep "db2c_$cfgusername" | cut -f2`
+			db2_path="/opt/ibm/db2"
+			hostname=`unit-get private-address`
+			dbusername=$cfgusername
+			dbuserpw=$cfgpasswd
+			db2_instance_name=$cfgusername
+
+
+			juju-log "IBM DB2: Sending the DB details to the consumer $service"
+			juju-log "Port number: $db2_port"
+			juju-log "Hostname: $hostname"
+			juju-log "DBusername: $dbusername DBuserpw: $dbuserpw"
+			juju-log "DB Instance name: $db2_instance_name"
+			juju-log "Service: $service_name"
+			juju-log "DBname: $dbs_created"
+
+			relation_call --state=db.ready set_db_details $service $db2_path $db2_port $hostname $dbusername $dbuserpw $db2_instance_name $dbs_created || true
+		fi
+
+		status-set active "IBM DB2 Ready"
+	done
+}
+
+@when 'ibm-db2.installed'
+@when 'db.departed'
+function stop_db2(){
+	juju-log "IBM DB2: Stopping the DB when relation is broken"
+	services=$(relation_call --state=db.departed services) || true
+	for service in $services; do
+		juju-log "IBM DB2: Service name is $service"
+		get_cfgusername $service
+		if su - $cfgusername -c 'ps -eaf|grep -i "\bdb2sysc 0\b" |grep -i '$cfgusername
+		then
+			su - $cfgusername -c 'db2 force applications all'
+			su - $cfgusername -c 'db2stop'
+			juju-log "IBM DB2: DB2 stopped for instance $cfgusername"
+		else
+			juju-log "IBM DB2: DB2 is already stopped for the instance $cfgusername"
+		fi
+		#Remove the ssh key entry from ssh keys file
+		remove_sshkeys $service
+		relation_call --state=db.departed dismiss_sshconfigured $service || true
+		relation_call --state=db.departed dismiss $service || true
+	done
+}
+
+
+reactive_handler_main
 
=== added file 'reactive/leadership.py'
--- reactive/leadership.py	1970-01-01 00:00:00 +0000
+++ reactive/leadership.py	2016-07-14 17:53:24 +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 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-07-14 17:53:24 +0000
@@ -0,0 +1,2 @@
+flake8
+pytest
 
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-12-07 02:57:11 +0000
+++ tests/00-setup	2016-07-14 17:53:24 +0000
@@ -1,31 +1,17 @@
 #!/bin/bash
 
 
-SFTP_USER_NAME=${SFTP_USER_NAME?Error: Need SFTP user name for logging into to sftp server}
-SFTP_PASSWORD=${SFTP_PASSWORD?Error: Need SFTP password for logging into to sftp server}
-PACKAGE_NAME=${DIR_NAME?Error: The path on sftp server for the packages for $CHARM_NAME}
-SFTP_HOST=${SFTP_HOST?Error: Need SFTP server Domain name}
-PACKAGE_DIR=${PACKAGE_DIR?Error: Need Package Directory name}
+DB2_CURL_URL=${DB2_CURL_URL?Error: IBM IM  curl_url be defined in tests/00-setup}
+DB2_CURL_OPTS=${DB2_CURL_OPTS?Error: IBM IM  curl_OPTS be defined in tests/00-setup}
+
 
 # Add a local configuration file
 cat << EOF > local.yaml
 ibm-repo:
-    sftp_user_name: "$SFTP_USER_NAME"
-    sftp_password: "$SFTP_PASSWORD"
-    package_name: "$PACKAGE_NAME"
-    sftp_host: "$SFTP_HOST"
-    package_dir: "$PACKAGE_DIR"
-EOF
-
-DB2_SHA_DISTRIBUTION_PKG=${DB2_SHA_DISTRIBUTION_PKG?Error: Checksum value for Distribution package must be defined in tests/00-setup}
-
-# Add a local configuration file
-cat << EOF >> local.yaml
-ibm-db2:
- db2distribution_pkg_sha: "$DB2_SHA_DISTRIBUTION_PKG"
- 
-EOF
-
-add-apt-repository ppa:juju/stable -y
-apt-get update
-apt-get install amulet -y
+    db2_curl_url: "$DB2_CURL_URL"
+    db2_curl_opts: "$DB2_CURL_OPTS"
+EOF
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3 -y
 
=== modified file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2015-12-07 03:38:45 +0000
+++ tests/10-bundles-test.py	2016-07-14 17:53:24 +0000
@@ -8,8 +8,9 @@
 import amulet
 import sys
 import time
+import requests
 
-seconds_to_wait = 1000
+seconds_to_wait = 20000
 
 
 class BundleTest(unittest.TestCase):
@@ -17,7 +18,7 @@
     @classmethod
     def setUpClass(cls):
         """ Set up an amulet deployment using the bundle. """
-        d = amulet.Deployment()
+        d = amulet.Deployment(juju_env='local', series='trusty')
         # We have a contextual test, if no config is present, initialze the
         # test with an empty configuration set
         config = {}
@@ -25,61 +26,28 @@
         with open(local_path, "r") as fd:
            config = yaml.safe_load(fd)
 
-        sftphost = config.get('ibm-repo').get('sftp_host')
-        if not sftphost:
-             message = 'Please provide the host name from where the package can be downloaded.'
+        curl_url = config.get('ibm-repo').get('db2_curl_url')
+        if not curl_url:
+             message = 'Please provide the curl url from where the package can be downloaded.'
              amulet.raise_status(amulet.FAIL, msg=message)
              sys.exit(1)
         
-        packagedir =  config.get('ibm-repo').get('package_dir')
-        if not packagedir:
-             message = 'Please provide the directory from where the package can be downloaded.'
-             amulet.raise_status(amulet.FAIL, msg=message)
-             sys.exit(1)
-
-        packagename = config.get('ibm-repo').get('package_name')
-        if not packagename:
-             message = 'Please provide the package name to download.'
-             amulet.raise_status(amulet.FAIL, msg=message)
-             sys.exit(1)
-
-        sftpusername = config.get('ibm-repo').get('sftp_user_name')
-        if not sftpusername:
-            message = 'Please provide the user name to log into the sftp server for downloading the package.'
-            amulet.raise_status(amulet.FAIL, msg=message)
-            sys.exit(1)
-
-        sftppasswd = config.get('ibm-repo').get('sftp_password')
-        if not sftppasswd:
-             message = 'Please provide the password to log into the sftp server for downloading the package.'
-             amulet.raise_status(amulet.FAIL, msg=message)
-             sys.exit(1)
-
-        db2distributionpkgsha = config.get('ibm-db2').get('db2distribution_pkg_sha')
-        print('Using SHA sum for distribution package %s' % db2distributionpkgsha)
-
-        if not db2distributionpkgsha:
-             message = 'Please provide the sha value to proceed further. Exiting before completing rest of the verification tests.'
-             amulet.raise_status(amulet.FAIL, msg=message)
-
-        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)
-
-
+        curl_opts =  config.get('ibm-repo').get('db2_curl_opts')
+        if not curl_opts:
+             message = 'Please provide the curl_opts to specify the credentials to download the packages.'
+             amulet.raise_status(amulet.FAIL, msg=message)
+             sys.exit(1)
+
+
+        d.add('ibm-db2')
+
+        d.configure('ibm-db2', { 'license_accepted': True, 
+                                 'curl_url': curl_url, 
+                                 'curl_opts': curl_opts })
         d.setup(seconds_to_wait)
         d.sentry.wait(seconds_to_wait)
         cls.d = d
 
-        d.configure('ibm-db2', { 'accept-ibm-db2-license': True, 
-                                 'host': sftphost, 
-                                 'package_dir': packagedir,
-                                 'username': sftpusername,
-                                 'password': sftppasswd, 
-                                 'db2_package_name': packagename, 
-                                 'sha': db2distributionpkgsha })
-        time.sleep(300)
 
 
     def test_deployed(self):
 
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +0000 differ
=== added file 'wheelhouse/PyYAML-3.11.zip'
 Binary files wheelhouse/PyYAML-3.11.zip	1970-01-01 00:00:00 +0000 and wheelhouse/PyYAML-3.11.zip	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +0000 differ
=== added file 'wheelhouse/charmhelpers-0.8.0.tar.gz'
 Binary files wheelhouse/charmhelpers-0.8.0.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charmhelpers-0.8.0.tar.gz	2016-07-14 17:53:24 +0000 differ
=== added file 'wheelhouse/charms.reactive-0.4.4.tar.gz'
 Binary files wheelhouse/charms.reactive-0.4.4.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/charms.reactive-0.4.4.tar.gz	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +0000 differ
=== added file 'wheelhouse/pyaml-15.8.2.tar.gz'
 Binary files wheelhouse/pyaml-15.8.2.tar.gz	1970-01-01 00:00:00 +0000 and wheelhouse/pyaml-15.8.2.tar.gz	2016-07-14 17:53:24 +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	2016-07-14 17:53:24 +0000 differ