revert

MHA-Team · Sep 11, 2019 · 145002f · 145002f
1 parent 9d7aba6
commit 145002f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 42 deletions.
diff --git a/menu/dependency/dependencydeb.yml b/menu/dependency/dependencydeb.yml
@@ -60,14 +60,14 @@
         state: latest
         executable: pip3
 
-    - name: Update pip packages for python2
-      pip:
-        name:
-          - pip
-          - setuptools
-          - pyOpenSSL
-          - requests
-          - netaddr
-          - lxml
-        state: latest
-        executable: pip2
+    # - name: Update pip packages for python2
+      # pip:
+        # name:
+          # - pip
+          # - setuptools
+          # - pyOpenSSL
+          # - requests
+          # - netaddr
+          # - lxml
+        # state: latest
+        # executable: pip2
diff --git a/menu/roles/dockerdeb/tasks/main.yml b/menu/roles/dockerdeb/tasks/main.yml
@@ -28,11 +28,11 @@
 - name: Install required packages
   apt: 'name={{item}} state=present'
   with_items:
-        - { package: 'apt-transport-https' }
-        - { package: 'ca-certificates' }
-        - { package: 'gnupg2' }
-        - { package: 'software-properties-common' }
-        - { package: 'curl' }
+    - apt-transport-https
+    - ca-certificates
+    - software-properties-common
+    - curl
+    - gnupg2
   when: switch == "on"
 
 - name: Add official gpg signing key
@@ -59,33 +59,25 @@
     update_cache: yes
   when: apt_docker_repositories.changed and switch == "on"
 
-# - name: Release docker-ce from hold
-  # dpkg_selections:
-    # name: docker-ce
-    # selection: install
-  # when: switch == "on"
-
-# - name: Install docker-ce
-  # apt:
-    # name: docker-ce
-    # state: present
-    # update_cache: yes
-  # when: switch == "on"
-
-# - name: Put docker-ce into hold
-  # dpkg_selections:
-    # name: docker-ce
-    # selection: hold
-  # when: switch == "on"
-
-- name: Install Docker Parts
-  apt: 'name={{item}} state=present'
-  with_items:
-        - { package: 'docker-ce' }
-        - { package: 'docker-ce-cli' }
-        - { package: 'containerd.io' }
+- name: Release docker-ce from hold
+  dpkg_selections:
+    name: docker-ce
+    selection: install
+  when: switch == "on"
+
+- name: Install docker-ce
+  apt:
+    name: docker-ce
+    state: present
+    update_cache: yes
   when: switch == "on"
-
+
+- name: Put docker-ce into hold
+  dpkg_selections:
+    name: docker-ce
+    selection: hold
+  when: switch == "on"
+
 - name: Uninstall docker-py pip module
   pip:
     name: docker-py