Multiple updates. Converted many of the Yaml files from "dos" format to
"unix" format. Finalized the creation of the final installer file set
that can be copied to a USB Flash drive or other removable media.
Updated the config file with comments to make it more user friendly.
Deleted ansible files that were no longer needed. This update continues
to address the requirements laid out by Jira VOL-6.
Change-Id: I7434d2ec01768121e8d2ec50bb633c515281b37a
diff --git a/install/ansible/roles/docker/defaults/main.yml b/install/ansible/roles/docker/defaults/main.yml
index 338d16e..1c138f8 100644
--- a/install/ansible/roles/docker/defaults/main.yml
+++ b/install/ansible/roles/docker/defaults/main.yml
@@ -3,4 +3,4 @@
centos_files: [
{ src: "docker.centos.repo", dest: "/etc/yum.repos.d/docker.repo" },
{ src: "docker.centos.service", dest: "/lib/systemd/system/docker.service" },
-]
\ No newline at end of file
+]
diff --git a/install/ansible/roles/docker/tasks/debian.yml b/install/ansible/roles/docker/tasks/debian.yml
index 081fda9..8eed0ff 100644
--- a/install/ansible/roles/docker/tasks/debian.yml
+++ b/install/ansible/roles/docker/tasks/debian.yml
@@ -1,91 +1,64 @@
-- name: Debian add Docker repository and update apt cache
- apt_repository:
- repo: deb https://apt.dockerproject.org/repo ubuntu-{{ debian_version }} main
- update_cache: yes
- state: present
- when: target == "installer"
- tags: [docker]
-
-- name: Debian Docker is present
- apt:
- name: docker-engine
- state: latest
- force: yes
- when: target == "installer"
- tags: [docker]
-
-#- name: Docker deb install file is present
-# get_url:
-# url: https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_17.05.0~ce-0~ubuntu-xenial_amd64.deb
-# dest: /home/vinstall
-# owner: vinstall
-# group: vinstall
-# when: target == "installer"
-# tags: [docker]
-
-#- name: Docker dependencies satisfied
-# apt:
-# name: libltdl7
-# state: latest
-# force: yes
-# when: target == "cluster"
-# tags: [docker]
-
-#- name: Docker install deb file is copied
-# copy:
-# src: /home/vinstall/docker-engine_17.05.0~ce-0~ubuntu-xenial_amd64.deb
-# dest: /home/voltha
-# when: target == "cluster"
-# tags: [docker]
-
-#- name: Docker engine is installed
-# apt:
-# deb: /home/vinstall/docker-engine_17.05.0~ce-0~ubuntu-xenial_amd64.deb
-# when: target == "cluster"
-# tags: [docker]
-
-- name: Debian python-pip is present
- apt: name=python-pip state=present
- tags: [docker]
-
-- name: Debian docker-py is present
- pip:
- name: docker-py
- version: 1.6.0
- state: present
- when: target == "installer"
- tags: [docker]
-
-- name: netifaces pip package is present
- pip:
- name: netifaces
- version: 0.10.4
- state: present
- when: target == "installer"
- tags: [docker]
-
-- name: Debian files are present
- template:
- src: "{{ docker_cfg }}"
- dest: "{{ docker_cfg_dest }}"
- register: copy_result
- tags: [docker]
-
-- name: Debian Daemon is reloaded
- command: systemctl daemon-reload
- when: copy_result|changed and is_systemd is defined
- tags: [docker]
-
-- name: vagrant user is added to the docker group
- user:
- name: "{{ ansible_env['SUDO_USER'] }}"
- group: docker
- register: user_result
- tags: [docker]
-
-- name: Debian Docker service is restarted
- service:
- name: docker
- state: restarted
- when: copy_result|changed or user_result|changed
- tags: [docker]
+- name: Debian add Docker repository and update apt cache
+ apt_repository:
+ repo: deb https://apt.dockerproject.org/repo ubuntu-{{ debian_version }} main
+ update_cache: yes
+ state: present
+ when: target == "installer"
+ tags: [docker]
+
+- name: Debian Docker is present
+ apt:
+ name: docker-engine
+ state: latest
+ force: yes
+ when: target == "installer"
+ tags: [docker]
+
+- name: Debian python-pip is present
+ apt:
+ name: python-pip
+ state: present
+ when: target == "installer"
+ tags: [docker]
+
+- name: Debian docker-py is present
+ pip:
+ name: docker-py
+ version: 1.6.0
+ state: present
+ when: target == "installer"
+ tags: [docker]
+
+- name: netifaces pip package is present
+ pip:
+ name: netifaces
+ version: 0.10.4
+ state: present
+ when: target == "installer"
+ tags: [docker]
+
+- name: Docker config files are present
+ template:
+ src: "{{ docker_cfg }}"
+ dest: "{{ docker_cfg_dest }}"
+ register: copy_result
+ tags: [docker]
+
+- name: Debian Daemon is reloaded
+ command: systemctl daemon-reload
+ when: copy_result|changed and is_systemd is defined
+ tags: [docker]
+
+- name: vagrant user is added to the docker group
+ user:
+ name: "{{ ansible_env['SUDO_USER'] }}"
+ group: docker
+ register: user_result
+ tags: [docker]
+
+- name: Debian Docker service is restarted
+ service:
+ name: docker
+ state: restarted
+ when: copy_result|changed or user_result|changed
+ tags: [docker]