Add docker support for Ubuntu 17.10 with Yardstick

JIRA: YARDSTICK-1119

Change-Id: I6d9b21667605f1c0a157c2a72e708c36b90e8c3a
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>

diff --git a/ansible/roles/docker/tasks/Debian.yml b/ansible/roles/docker/tasks/Debian.yml
index cf41287..7f998de 100644 (file)
--- a/ansible/roles/docker/tasks/Debian.yml
+++ b/ansible/roles/docker/tasks/Debian.yml
@@ -12,15 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-  - name: add Ubuntu docker repo
-    apt_repository: repo='deb [trusted=yes] {{ ubuntu_docker_url }} ubuntu-{{ ansible_distribution_release }} main' state=present
-
-  - name: ensure correct docker version
-    action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-    with_items: "{{ docker_packages[ansible_os_family] }}"
-
-  - name: remove Ubuntu docker repo
-    apt_repository:
-      repo: 'deb [trusted=yes] {{ ubuntu_docker_url }} ubuntu-{{ ansible_distribution_release }} main'
-      state: absent
-      update_cache: no
+  - name: Install docker.io
+    action: "{{ ansible_pkg_mgr }} name=docker.io state=present force=yes"

diff --git a/ansible/roles/docker/vars/main.yml b/ansible/roles/docker/vars/main.yml
index 8b50774..a735d52 100644 (file)
--- a/ansible/roles/docker/vars/main.yml
+++ b/ansible/roles/docker/vars/main.yml
@@ -16,5 +16,3 @@ docker_project_url: https://yum.dockerproject.org
 docker_packages:
   "RedHat":
     - docker-engine-1.13.1
-  "Debian":
-    - docker-engine=1.13.1*