增加docker环境基础安装

roles/package-build/tasks/DockerEnvDownload.yml

@@ -0,0 +1,6 @@
+---
+- name: 'Unarchive docker env rpm file from remote host'
+  unarchive:
+    src: "{{ tsgDiagnoseDockerFile.unarchiveUrl }}"
+    dest: "{{ tsgDiagnoseDockerFile.unarchiveDest }}"
+    remote_src: yes

roles/package-build/tasks/main.yml

@@ -1,3 +1,4 @@
 ---
+- include: DockerEnvDownload.yml
 - include: RpmDownload.yml
 - include: TarBuild.yml 

roles/tsg-diagnose/tasks/DockerEnv.yml

@@ -0,0 +1,19 @@
+--- 
+- name: "Install docker-ce"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-ce/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCe }}"
+
+- name: "Install docker-compose"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-compose/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCompose }}"
+
+- name: 'Docker service start'
+  systemd:
+    name: docker
+    enabled: yes
+    daemon_reload: yes
+

roles/tsg-diagnose/tasks/TsgDiagnose.yml

@@ -0,0 +1,12 @@
+--- 
+- name: "Install tsg-diagnose rpm package"
+  yum:
+    name:
+      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
+    state: present
+    
+- name: 'Tsg-diagnose service start'
+  systemd:
+    name: tsg-diagnose
+    enabled: yes
+    daemon_reload: yes

roles/tsg-diagnose/tasks/main.yml

@@ -1,21 +1,14 @@
 --- 
-- name: 'copy file to device'
+- name: 'Copy tsg-diagnose file to device'
   copy: 
     src: "{{item.src}}"
     dest: "{{item.dest}}"
     mode: "{{item.mode}}"
   with_items:
     - { src: "{{ role_path }}/files/", dest: "/tmp/ansible_deploy/tsg-diagnose", mode: '0755' }
-
-- name: "install kni rpms from localhost"
-  yum:
-    name:
-      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
-    state: present
     
-- name: 'tsg-diagnose service start and docker-compose up'
-  systemd:
-    name: tsg-diagnose
-    enabled: yes
-    daemon_reload: yes
+- name: 'Install docker env rpm'
+  include: DockerEnv.yml
 
+- name: 'Install Tsg-diagnose'
+  include: TsgDiagnose.yml