Migrate to docker.io's docker package

roles/common/files/docker-io.repo

@@ -0,0 +1,6 @@
+[dockerrepo]
+name=Docker Repository
+baseurl=https://yum.dockerproject.org/repo/main/centos/7
+enabled=1
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg

roles/common/tasks/main.yml

@@ -98,6 +98,7 @@
   with_items:
     - asteris-mantl-rpm.repo
     - ciscocloud-rpm.repo
+    - docker-io.repo
 
 - include: users.yml
 - include: ssl.yml

roles/docker/tasks/main.yml

@@ -15,15 +15,38 @@
     name: "{{ item }}"
     state: present
   with_items:
+    - docker-engine
+  tags:
     - docker
-    - docker-selinux
+    - bootstrap
+
+- name: create directory for local docker service override
+  sudo: yes
+  file:
+    dest:  /etc/systemd/system/docker.service.d
+    state: directory
+    mode: 0755
   tags:
     - docker
     - bootstrap
 
+# Not restart docker on file drop
+- name: create local docker service override
+  sudo: yes
+  copy:
+    dest: /etc/systemd/system/docker.service.d/storage.conf
+    content: |
+      [Service]
+      EnvironmentFile=-/etc/sysconfig/docker-storage
+      EnvironmentFile=-/etc/sysconfig/docker
+      ExecStart=
+      ExecStart=/usr/bin/docker daemon $OPTIONS $DOCKER_STORAGE_OPTIONS -H fd://
+  tags:
+    - docker
+
 - name: check if docker storage already set up with devicemapper
   sudo: yes
-  shell: "test -f /etc/sysconfig/docker-storage-setup && . /etc/sysconfig/docker-storage-setup && echo ${STORAGE_DRIVER:-NOT_SET}"
+  shell: "test -f /etc/sysconfig/docker-storage-setup && . /etc/sysconfig/docker-storage-setup || true && echo ${STORAGE_DRIVER:-NOT_SET}"
   register: docker_storage_already_set_up
   tags:
     - disk
@@ -46,36 +69,11 @@
     - disk
     - docker
 
-# FIXME: commented out, it should be done by dependencies from docker
-#- name: create backing storage filesystem for docker storage
-#  sudo: yes
-#  shell: "/usr/local/bin/mantl-storage-setup"
-#  tags:
-#    - disk
-#    - docker
-
 - name: setup docker storage
-  sudo: yes
-  lineinfile:
-    dest: /etc/sysconfig/docker-storage-setup
-    regexp: "^{{ item.var }}=.*"
-    line: "{{ item.var }}={{ item.value }}"
-    state: present
-    create: yes
-  with_items:
-    - var: STORAGE_DRIVER
-      value: "{{ docker_storage_driver }}"
-    - var: DATA_SIZE
-      value: "{{ docker_lvm_data_volume_size }}"
-    - var: VG
-      value: "{{ volume_group_name }}"
-    - var: MIN_DATA_SIZE
-      value: "{{ docker_lvm_data_volume_size_min }}"
-    - var: AUTO_EXTEND_POOL
-      value: "{{ docker_lvm_auto_extend_pool }}"
-  when: docker_lvm_backed|bool and docker_storage_already_set_up.stdout == "NOT_SET"
-  tags:
-    - docker
+  when: docker_lvm_backed|bool and docker_storage_already_set_up.stdout == "devicemapper"
+  fail:
+    msg: |
+      Devicemapper support in mantle now deprecated.
 
 - include: lvm.yml
   when: docker_lvm_backed|bool