Merge branch 'master' into unreachable_code

.kitchen.yml

@@ -17,6 +17,11 @@ provisioner:
 platforms:
   - name: ubuntu-16.04
     driver_config:
+      image: ubuntu:16.04
+      provision_command:
+        - apt-get update && apt-get install -y locales ifupdown
+        - locale-gen en_US.UTF-8
+        - update-locale LANG=en_US.UTF-8
       run_command: /lib/systemd/systemd
   - name: debian-jessie
     driver_config:
@@ -25,7 +30,7 @@ platforms:
         - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen || true
         - dpkg-reconfigure --frontend=noninteractive locales || true
         - update-locale LANG=en_US.UTF-8 || true
-      run_command: /sbin/init
+      run_command: /lib/systemd/systemd
 
 suites:
   - name: default

docker/codenamemap.yaml

@@ -20,9 +20,15 @@ jessie:
       humanname: Jessie Backports
       dist: jessie-backports
 
+trusty:
+  kernel:
+    pkgs:
+      - linux-image-extra-virtual
+      - linux-image-extra-{{ grains.kernelrelease }}
+
 precise:
   kernel:
-    pkg:
-      pkgs:
-        - linux-image-generic-lts-raring
-        - linux-headers-generic-lts-raring
+    pkgs:
+      - linux-image-generic-lts-raring
+      - linux-headers-generic-lts-raring
+

docker/compose.sls

@@ -1,13 +1,12 @@
 {% from "docker/map.jinja" import docker with context %}
 
-compose-pip:
+docker-compose-pip:
   pkg.installed:
     - name: python-pip
-  pip.installed:
-    - name: pip
-    - upgrade: True
+    - require_in:
+      - pkg: docker-compose
 
-compose:
+docker-compose:
   pip.installed:
     {%- if docker.compose_version %}
     - name: docker-compose == {{ docker.compose_version }}

docker/defaults.yaml

@@ -2,12 +2,12 @@
 
 docker:
   process_signature: '/usr/bin/docker'
-  python_pip_package: 'python-pip'
   install_docker_py: False
   refresh_repo: True
   config: []
 
   pip:
+    pkgname: python-pip
     upgrade: False
 
   use_upstream_repo: True
@@ -19,5 +19,9 @@ docker:
     force_running: False
 
   kernel:
+
     pkg:
       fromrepo: '' 
+
+    pkgs: []
+

docker/files/systemd.conf

@@ -3,12 +3,7 @@ Description=Docker container for {{ name }}
 Requires=docker.service
 After=docker.service
 
-{#- Ugly, but covers the cases where variable evaluates to false, is empty, or non-existent #}
-{%- set runoptions = container.get("runoptions", []) %}
-{%- set stopoptions = container.get("stopoptions", []) %}
 {%- set remove_on_stop = container.get("remove_on_stop", False) %}
-{%- set cmd = container.get("cmd") or "" %}
-
 {%- set pull_before_start = container.get("pull_before_start") or False %}
 
 [Service]
@@ -17,10 +12,10 @@ Restart=always
 ExecStartPre=/usr/bin/docker pull {{ container.image }}
 {%- endif %}
 
-ExecStart=/usr/bin/docker run {% for option in runoptions %}{{ option }} {% endfor %} --name={{ name }} {{ container.image }} {{ cmd }}
-ExecStop=/usr/bin/docker stop {% for option in stopoptions %}{{ option }} {% endfor %} {{ name }}
+ExecStart=/usr/bin/docker {{ docker_start_command }}
+ExecStop=/usr/bin/docker {{ docker_stop_command }}
 {%- if remove_on_stop %}
-ExecStopPost=/usr/bin/docker rm -f {{ name }}
+ExecStopPost=/usr/bin/docker {{ docker_poststop_command }}
 {%- endif %}
 
 StandardOutput=null

docker/init.sls

@@ -13,6 +13,11 @@ docker package dependencies:
       {%- endif %}
       - iptables
       - ca-certificates
+      {% if docker.kernel.pkgs is defined %}
+        {% for pkg in docker.kernel.pkgs %}
+        - {{ pkg }}
+        {% endfor %}
+      {% endif %}
     - unless: test "`uname`" = "Darwin"
 
 {% set repo_state = 'absent' %}
@@ -27,13 +32,13 @@ docker package repository:
     - name: deb http://http.debian.net/debian jessie-backports main
   {%- else %}
     {%- if "version" in docker %}
-      {%- if (docker.version|string).startswith('1.7.') %}
-        {%- set use_old_repo = docker.version < '1.7.1' %}
+      {%- if (docker.version|string).startswith('1.5.') %}
+        {%- set use_old_repo = docker.version < '1.5.1' %}
       {%- else %}
         {%- set version_major = (docker.version|string).split('.')[0]|int %}
         {%- set version_minor = (docker.version|string).split('.')[1]|int %}
         {%- set old_repo_major = 1 %}
-        {%- set old_repo_minor = 7 %}
+        {%- set old_repo_minor = 5 %}
         {%- set use_old_repo = (version_major < old_repo_major or (version_major == old_repo_major and version_minor < old_repo_minor)) %}
       {%- endif %}
     {%- endif %}
@@ -142,15 +147,6 @@ docker-service:
 docker-py requirements:
   pkg.installed:
     - name: {{ docker.python_pip_package }}
-  pip.installed:
-    {%- if "pip" in docker and "version" in docker.pip and "version" in docker.pip %}
-    - name: pip {{ docker.pip.version }}
-    {%- else %}
-    - name: pip
-    {%- if "pip" in docker and "upgrade" in docker.pip and docker.pip.upgrade %}
-    - upgrade: True
-    {%- endif %}
-    {%- endif %}
 
 docker-py:
   pip.installed:

docker/map.jinja

@@ -26,13 +26,17 @@
 # Begin migration to new style map.jinja
 {% import_yaml "docker/defaults.yaml" as defaults %}
 {% import_yaml "docker/codenamemap.yaml" as codemap %}
+{% import_yaml "docker/osmap.yaml" as osmap %}
 
 {% set pkg = salt['pillar.get']('docker-pkg:lookup', default={}, merge=True) %}
 {% do defaults.docker.update(pkg) %}
 
 {% set oscode = salt['grains.filter_by'](codemap, grain='oscodename') or {} %}
 {% do defaults.docker.update(oscode) %}
 
+{% set os = salt['grains.filter_by'](osmap, grain='os') or {} %}
+{% do defaults.docker.update(os) %}
+
 {% set docker = salt['pillar.get']('docker', default=defaults['docker'], merge=True) %}
 
 {% set compose = salt['pillar.get']('docker:compose', default={}, merge=True) %}

docker/osmap.yaml

@@ -0,0 +1,6 @@
+
+CentOS:
+  pip:
+    pkgname: python2-pip
+
+# vim: ft=sls