Merge lp:~lazypower/charms/trusty/docker/trunk into lp:charms/trusty/docker

[Charles Butler]

  Import of v0.0.6
  ================
  Adds dockerpy + virtualenv to baseline install
  Adds configurable option to set the version installed when latest=true
  Patched a bug affecting empty template rendering during SDN network configuration
  Adds stop hook to strip the core docker installation from the system during destroy-of-service cycle.

[Whit Morriss (whitmo)]

+1 LGTM. Needed for k8s upstreaming.

review: Approve

[lp:~lazypower/charms/trusty/docker/trunk]

5. By Matt Bruzek on 2015-04-22

[lazypower] Import of v0.0.6
  ================
  Adds dockerpy + virtualenv to baseline install
  Adds configurable option to set the version installed when latest=true
  Patched a bug affecting empty template rendering during SDN network configuration
  Adds stop hook to strip the core docker installation from the system during destroy-of-service cycle.

[Matt Bruzek (mbruzek)]

Charles,

Thanks for this update, I deployed the charm and it works as expected.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-16 22:42:54 +0000
+++ config.yaml	2015-04-22 21:37:39 +0000
@@ -5,3 +5,10 @@
     description: | 
       If True, deploy the latest version of docker, when False (default) 
       installs docker.io from the Ubuntu package archive."
+  version:
+    type: string
+    default: 1.5.0
+    description: |
+      When latest = true, specify the version to install from the PPA.
+      latest = false will always assume use the current stable in distro.
+

=== added symlink 'hooks/stop'
=== target is u'hooks.py'
=== modified file 'playbooks/install-or-upgrade.yaml'
--- playbooks/install-or-upgrade.yaml	2015-01-16 22:42:54 +0000
+++ playbooks/install-or-upgrade.yaml	2015-04-22 21:37:39 +0000
@@ -4,3 +4,9 @@
 
 - name: Add ubuntu to Docker group
   user: name=ubuntu state=present groups="docker"
+
+- name: install virtualenv
+  apt: name=virtualenvwrapper state=present
+
+- name: Install docker-py
+  pip: "name=docker-py virtualenv={{ charm_dir}}/.venv"

=== modified file 'playbooks/installation-status.yaml'
--- playbooks/installation-status.yaml	2015-01-16 22:42:54 +0000
+++ playbooks/installation-status.yaml	2015-04-22 21:37:39 +0000
@@ -4,11 +4,15 @@
   shell: "dpkg -l docker.io | grep docker.io | cut -d' '  -f1"
   register: universe_check
 
+# Updated due to bug #24
 - name: check for lxc-docker
-  shell: "dpkg -l lxc-docker | grep lxc-docker | cut -d' '  -f1"
+  shell: "dpkg -l lxc-docker-{{version}} | grep lxc-docker | cut -d' '  -f1"
   register: latest_check
 
 - set_fact:
     universe_installed: "{{universe_check.stdout == 'ii'}}"
     latest_installed: "{{latest_check.stdout == 'ii'}}"
 
+- debug: msg="{{latest_installed}}"
+- debug: msg="{{universe_installed}}"
+

=== modified file 'playbooks/latest-docker.yaml'
--- playbooks/latest-docker.yaml	2015-01-16 22:42:54 +0000
+++ playbooks/latest-docker.yaml	2015-04-22 21:37:39 +0000
@@ -12,6 +12,4 @@
 - debug: msg="Installing latest"
 
 - name: Install required packages.
-  apt: pkg={{ item }} state=latest update_cache=yes
-  with_items:
-    - lxc-docker
+  apt: name=lxc-docker-{{ version }} state=present update_cache=yes

=== modified file 'playbooks/network-relation-changed.yaml'
--- playbooks/network-relation-changed.yaml	2015-01-16 22:42:54 +0000
+++ playbooks/network-relation-changed.yaml	2015-04-22 21:37:39 +0000
@@ -34,13 +34,13 @@
     docker_opts: "{{ docker_opts }} --mtu {{ flannel_mtu }}"
     when: "{{ flannel_mtu != '' }}"
 
-- name: Render docker defaults template
+- name: Render docker.io defaults template
   template: src=docker dest=/etc/default/docker.io
-  when: universe_installed
+  when: universe_installed == "True" and flannel_subnet != ''
 
-- name: Render docker defaults template
+- name: Render lxc-docker defaults template
   template: src=docker dest=/etc/default/docker
-  when: latest_installed
+  when: latest_installed == "True" and flannel_subnet != ''
 
 - name: Halt docker service
   service: name=docker state=stopped

=== modified file 'playbooks/site.yaml'
--- playbooks/site.yaml	2015-01-16 22:42:54 +0000
+++ playbooks/site.yaml	2015-04-22 21:37:39 +0000
@@ -6,6 +6,7 @@
       tags:
         - config-changed
         - network-relation-changed
+        - stop
 
     - name: install or upgrade
       include: install-or-upgrade.yaml
@@ -23,3 +24,7 @@
       tags:
         - network-relation-changed
 
+    - name: Uninstall Docker
+      include: uninstall-docker.yaml
+      tags:
+        - stop

=== added file 'playbooks/uninstall-docker.yaml'
--- playbooks/uninstall-docker.yaml	1970-01-01 00:00:00 +0000
+++ playbooks/uninstall-docker.yaml	2015-04-22 21:37:39 +0000
@@ -0,0 +1,9 @@
+---
+- name: remove docker.io
+  apt: name=docker.io state=absent
+  when: universe_installed
+
+- name: remove lxc-docker
+  apt: name=lxc-docker state=absent
+  when: latest_installed
+