Merge lp:~zulcss/charms/trusty/lxd/lxd-ppa into lp:~openstack-charmers-archive/charms/trusty/lxd/next

[Chuck Short]

Rename source to lxd-ppa so that it doesn't clobber other openstack config options.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #827 lxd-next for zulcss mp286700
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/
Build: http://10.245.162.36:8080/job/charm_unit_test/827/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #926 lxd-next for zulcss mp286700
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/926/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #374 lxd-next for zulcss mp286700
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/374/

Unmerged revisions

51. By Chuck Short on 2016-02-19

Rename source to lxd-origin not to clobber with other openstack config variables.

=== modified file 'config.yaml'
--- config.yaml	2015-10-02 11:59:06 +0000
+++ config.yaml	2016-02-19 18:36:23 +0000
@@ -1,5 +1,5 @@
 options:
-  source:
+  lxd-origin:
     type: string
     default:
     description: |

=== modified file 'hooks/lxd_hooks.py'
--- hooks/lxd_hooks.py	2015-10-26 12:59:46 +0000
+++ hooks/lxd_hooks.py	2016-02-19 18:36:23 +0000
@@ -46,8 +46,8 @@
 @hooks.hook()
 def install():
     status_set('maintenance', 'Installing LXD packages')
-    if config('source'):
-        add_source(config('source'))
+    if config('lxd-origin'):
+        add_source(config('lxd-origin'))
     apt_update(fatal=True)
     apt_install(determine_packages(), fatal=True)
     if config('use-source'):