Upgrade docker, docker-py and migration logic

Author: Leonidas Tsampros

Diff for: .kitchen.yml

@@ -2,18 +2,24 @@
 provisioner:
   name: salt_solo
   formula: docker
+  salt_version: "2014.7.5"
+  salt_bootstrap_url: "https://raw.githubusercontent.com/saltstack/salt-bootstrap/6080a18e6c7c2d49335978fa69fa63645b45bc2a/bootstrap-salt.sh"
+  salt_install: "bootstrap"
   vendor_path: "vendor/_root" 
+  salt_file_root: "/srv/salt"
   state_top:
     base:
       '*':
         - docker
   omnibus_cachier: true
 
+
+
 platforms:
   - name: vagrant-ubuntu-12.04
     driver_plugin: vagrant
     driver_config:
-      pre_create_command: "salt-shaker shake root_formula=ministryofjustice/docker-formula"
+      pre_create_command: "salt-shaker --verbose --root_dir vendor/ install"
       vagrantfile_erb: "kitchenvagrant/Vagrantfile.erb"
       cachier:
         scope: "box"
@@ -22,18 +28,26 @@ platforms:
       box: "hashicorp/precise64"
       box_url: "https://vagrantcloud.com/hashicorp/boxes/precise64"
 
-  - name: aws-ubuntu-12.04
-    driver_plugin: ec2
+  - name: vagrant-ubuntu-14.04
+    driver_plugin: vagrant
     driver_config:
-      aws_access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
-      aws_secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
-      aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] %>
-      ssh_key: <%= File.expand_path("~/.ssh/#{ENV['AWS_SSH_KEY_ID']}.pem") %>
-      image_id: ami-8e987ef9
-      username: ubuntu
-      security_group_ids: ["sg-e932d286"]
-      region: eu-west-1
-      availability_zone: eu-west-1a
+      vagrantfile_erb: "kitchenvagrant/Vagrantfile.erb"
+      cachier:
+        scope: "box"
+      customize:
+        memory: 1024
+      box: "ubuntu/trusty64"
+      box_url: "https://atlas.hashicorp.com/ubuntu/boxes/trusty64"
+
 
 suites:
   - name: default
+    provisioner:
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - docker
+        docker.sls:
+          docker:
+            datadir: "/home/docker"

Diff for: Rakefile

@@ -1,39 +1,7 @@
-require 'kitchen'
-require 'fileutils'
 
-namespace :test do
-  config = Kitchen::Config.new
-
-  desc "Resolve salt formula dependencies"
-  task :shaker do
-    # "diagnose" method is the only PUBLIC method which will give you a hash of merged configs
-    formula = "#{config.loader.diagnose[:combined_config][:raw_data]["provisioner"]["formula"]}-formula"
-    run_shaker = "salt-shaker shake root_formula=ministryofjustice/#{formula}"
-    puts "Resolving formula dependencies: #{run_shaker}"
-    sh run_shaker do |ok, res|
-      if !ok
-        abort "Failed: (status = #{res.exitstatus})"
-      end
-    end
-  end
-
-  # initialize test-kitchen instances
-  config.instances.each do |instance|
-    case instance.name
-      when /vagrant/ 
-        desc 'Run Test Kitchen in Vagrant'
-        task :vagrant => "test:shaker" do
-          Kitchen.logger = Kitchen.default_file_logger
-          instance.test(:always)
-        end
-      when /aws/
-        desc 'Run Test Kitchen in AWS'
-        task :aws => "test:shaker" do
-          Kitchen.logger = Kitchen.default_file_logger
-          instance.test(:always)
-        end
-    end
-  end
+begin
+  require 'kitchen/rake_tasks'
+  Kitchen::RakeTasks.new
+rescue LoadError
+  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
 end
-
-task default: ['test:vagrant']

Diff for: docker/files/docker.key

@@ -1,19 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
 
-mQENBFIOqEUBCADsvqwefcPPQArws9jHF1PaqhXxkaXzeE5uHHtefdoRxQdjoGok
-HFmHWtCd9zR7hDpHE7Q4dwJtSFWZAM3zaUtlvRAgvMmfLm08NW9QQn0CP5khjjF1
-cgckhjmzQAzpEHO5jiSwl0ZU8ouJrLDgmbhT6knB1XW5/VmeECqKRyhlEK0zRz1a
-XV+4EVDySlORmFyqlmdIUmiU1/6pKEXyRBBVCHNsbnpZOOzgNhfMz8VE8Hxq7Oh8
-1qFaFXjNGCrNZ6xr/DI+iXlsZ8urlZjke5llm4874N8VPUeFQ/szmsbSqmCnbd15
-LLtrpvpSMeyRG+LoTYvyTG9QtAuewL9EKJPfABEBAAG0OURvY2tlciBSZWxlYXNl
-IFRvb2wgKHJlbGVhc2Vkb2NrZXIpIDxkb2NrZXJAZG90Y2xvdWQuY29tPokBOAQT
-AQIAIgUCUg6oRQIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ2Fdqi6iN
-IenM+QgAnOiozhHDAYGO92SmZjib6PK/1djbrDRMreCT8bnzVpriTOlEtARDXsmX
-njKSFa+HTxHi/aTNo29TmtHDfUupcfmaI2mXbZt1ixXLuwcMv9sJXKoeWwKZnN3i
-9vAM9/yAJz3aq+sTXeG2dDrhZr34B3nPhecNkKQ4v6pnQy43Mr59Fvv5CzKFa9oZ
-IoZf+Ul0F90HSw5WJ1NsDdHGrAaHLZfzqAVrqHzazw7ghe94k460T8ZAaovCaTQV
-HzTcMfJdPz/uTim6J0OergT9njhtdg2ugUj7cPFUTpsxQ1i2S8qDEQPL7kabAZZo
-Pim0BXdjsHVftivqZqfWeVFKMorchQ==
-=fRgo
+mQINBFWln24BEADrBl5p99uKh8+rpvqJ48u4eTtjeXAWbslJotmC/CakbNSqOb9o
+ddfzRvGVeJVERt/Q/mlvEqgnyTQy+e6oEYN2Y2kqXceUhXagThnqCoxcEJ3+KM4R
+mYdoe/BJ/J/6rHOjq7Omk24z2qB3RU1uAv57iY5VGw5p45uZB4C4pNNsBJXoCvPn
+TGAs/7IrekFZDDgVraPx/hdiwopQ8NltSfZCyu/jPpWFK28TR8yfVlzYFwibj5WK
+dHM7ZTqlA1tHIG+agyPf3Rae0jPMsHR6q+arXVwMccyOi+ULU0z8mHUJ3iEMIrpT
+X+80KaN/ZjibfsBOCjcfiJSB/acn4nxQQgNZigna32velafhQivsNREFeJpzENiG
+HOoyC6qVeOgKrRiKxzymj0FIMLru/iFF5pSWcBQB7PYlt8J0G80lAcPr6VCiN+4c
+NKv03SdvA69dCOj79PuO9IIvQsJXsSq96HB+TeEmmL+xSdpGtGdCJHHM1fDeCqkZ
+hT+RtBGQL2SEdWjxbF43oQopocT8cHvyX6Zaltn0svoGs+wX3Z/H6/8P5anog43U
+65c0A+64Jj00rNDr8j31izhtQMRo892kGeQAaaxg4Pz6HnS7hRC+cOMHUU4HA7iM
+zHrouAdYeTZeZEQOA7SxtCME9ZnGwe2grxPXh/U/80WJGkzLFNcTKdv+rwARAQAB
+tDdEb2NrZXIgUmVsZWFzZSBUb29sIChyZWxlYXNlZG9ja2VyKSA8ZG9ja2VyQGRv
+Y2tlci5jb20+iQI4BBMBAgAiBQJVpZ9uAhsvBgsJCAcDAgYVCAIJCgsEFgIDAQIe
+AQIXgAAKCRD3YiFXLFJgnbRfEAC9Uai7Rv20QIDlDogRzd+Vebg4ahyoUdj0CH+n
+Ak40RIoq6G26u1e+sdgjpCa8jF6vrx+smpgd1HeJdmpahUX0XN3X9f9qU9oj9A4I
+1WDalRWJh+tP5WNv2ySy6AwcP9QnjuBMRTnTK27pk1sEMg9oJHK5p+ts8hlSC4Sl
+uyMKH5NMVy9c+A9yqq9NF6M6d6/ehKfBFFLG9BX+XLBATvf1ZemGVHQusCQebTGv
+0C0V9yqtdPdRWVIEhHxyNHATaVYOafTj/EF0lDxLl6zDT6trRV5n9F1VCEh4Aal8
+L5MxVPcIZVO7NHT2EkQgn8CvWjV3oKl2GopZF8V4XdJRl90U/WDv/6cmfI08GkzD
+YBHhS8ULWRFwGKobsSTyIvnbk4NtKdnTGyTJCQ8+6i52s+C54PiNgfj2ieNn6oOR
+7d+bNCcG1CdOYY+ZXVOcsjl73UYvtJrO0Rl/NpYERkZ5d/tzw4jZ6FCXgggA/Zxc
+jk6Y1ZvIm8Mt8wLRFH9Nww+FVsCtaCXJLP8DlJLASMD9rl5QS9Ku3u7ZNrr5HWXP
+HXITX660jglyshch6CWeiUATqjIAzkEQom/kEnOrvJAtkypRJ59vYQOedZ1sFVEL
+MXg2UCkD/FwojfnVtjzYaTCeGwFQeqzHmM241iuOmBYPeyTY5veF49aBJA1gEJOQ
+TvBR8Q==
+=Fm3p
 -----END PGP PUBLIC KEY BLOCK-----

Diff for: docker/init.sls

@@ -6,12 +6,15 @@ include:
 docker-dependencies:
   pkg.installed:
     - pkgs:
+      - pciutils
+      - procps
       - ca-certificates
       - linux-image-extra-{{ salt['grains.get']('kernelrelease') }}
 
 docker-pkg:
   pkg.installed:
-    - name: {{ docker.pkg }}-{{ docker.pkg_version }}
+    - name: {{ docker.pkg }}
+    - version: {{ docker.pkg_version }}-0~{{ grains.lsb_distrib_codename }}
     - require:
       - pkg: docker-dependencies
       - pkgrepo: docker_repo
@@ -38,3 +41,4 @@ docker:
 
 aufs:
   kmod.present
+

Diff for: docker/map.jinja

@@ -1,8 +1,8 @@
 {% set docker = salt['grains.filter_by']({
     'Debian': {
-        'pkg': 'lxc-docker',
-        'pkg_version': '1.6.2',
-        'py_version': '1.2.2',
+        'pkg': 'docker-engine',
+        'pkg_version': '1.12.3',
+        'py_version': '1.10.6',
         'datadir': '',
     },
     'default': 'Debian',

Diff for: docker/repo/init.sls

@@ -1,5 +1,9 @@
 docker_repo:
   pkgrepo.managed:
-    - repo: 'deb https://get.docker.com/ubuntu docker main'
+    - repo: 'deb https://apt.dockerproject.org/repo ubuntu-{{ grains.lsb_distrib_codename }} main'
     - file: '/etc/apt/sources.list.d/docker.list'
     - key_url: salt://docker/files/docker.key
+  pkgrepo.absent:
+    - repo: 'deb https://get.docker.com/ubuntu docker main'
+    - file: '/etc/apt/sources.list.d/docker.list'
+

Diff for: docker/repo/migration.sls

@@ -0,0 +1,8 @@
+{% if 'lxc-docker' in salt['pkg.list_pkgs']() %}
+
+docker-remove:
+  pkg.purged:
+     - name: lxc-docker
+
+{% endif %}
+

Diff for: formula-requirements.txt

@@ -1 +1 @@
-[email protected]:ministryofjustice/python-formula.git
+ministryofjustice/python-formula==v1.1.5