diff options
| -rw-r--r-- | build_config/group_vars/local.yml | 29 | ||||
| -rw-r--r-- | customize.yml | 8 | ||||
| -rw-r--r-- | deploy.yml | 1 | ||||
| -rw-r--r-- | roles/package-build/tasks/ImageDownload.yml | 23 | ||||
| -rw-r--r-- | roles/package-build/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/self-test/files/rpms/.gitkeep | 0 | ||||
| -rw-r--r-- | roles/self-test/tasks/main.yml | 31 | ||||
| -rw-r--r-- | roles/tsg-diagnose/files/rpms/.gitkeep (renamed from roles/self-test/files/images/.gitkeep) | 0 | ||||
| -rw-r--r-- | roles/tsg-diagnose/tasks/main.yml | 21 |
9 files changed, 27 insertions, 87 deletions
diff --git a/build_config/group_vars/local.yml b/build_config/group_vars/local.yml index 1690282..5b261d4 100644 --- a/build_config/group_vars/local.yml +++ b/build_config/group_vars/local.yml @@ -1,33 +1,6 @@ -#dockerImages: -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest" -# tag: latest -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr" -# tag: latest -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl" -# tag: latest -# -#dockerImages2tags: -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest" -# repo: "unittest-self-test:latest" -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest" -# repo: "wpr-self-test:latest" -# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest" -# repo: "badssl-self-test:latest" -# -#dockerImagesTar: -# - name: "unittest-self-test" -# tag: "latest" -# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/unittest.tar -# - name: "wpr-self-test" -# tag: "latest" -# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/wpr.tar -# - name: "badssl-self-test" -# tag: "latest" -# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/badssl.tar -# tarpath: src: - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/install_config - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/deploy.yml - - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test + - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose destdict: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build/ diff --git a/customize.yml b/customize.yml index c985bb0..f94d8fd 100644 --- a/customize.yml +++ b/customize.yml @@ -1,5 +1,5 @@ rpmdict: - selftest: - fullname: "self-test-ci_test_rpm-1.el7.x86_64.rpm" - name: "self-test" - downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/rpms"
\ No newline at end of file + tsgDiagnose: + fullname: "tsg-diagnose-test_edit_name-1.el7.x86_64.rpm" + name: "tsg-diagnose" + downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files/rpms"
\ No newline at end of file @@ -16,6 +16,7 @@ - certstore - cert-redis - telegraf_statistic + - tsg-diagnose - hosts: blade-01 roles: diff --git a/roles/package-build/tasks/ImageDownload.yml b/roles/package-build/tasks/ImageDownload.yml deleted file mode 100644 index 72fb02c..0000000 --- a/roles/package-build/tasks/ImageDownload.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: "pull image from remote git registry" - docker_image: - name: "{{ item.name }}" - tag: "{{ item.tag }}" - source: pull - with_items: "{{ dockerImages }}" - -- name: "add tag" - docker_image: - name: "{{ item.name }}" - repository: "{{ item.repo }}" - force_tag: yes - source: local - with_items: "{{ dockerImages2tags }}" - -- name: "Archive image" - docker_image: - name: "{{ item.name }}" - tag: "{{ item.tag }}" - archive_path: "{{ item.tarpath }}" - source: local - with_items: "{{ dockerImagesTar }}" diff --git a/roles/package-build/tasks/main.yml b/roles/package-build/tasks/main.yml index 5819080..d53b760 100644 --- a/roles/package-build/tasks/main.yml +++ b/roles/package-build/tasks/main.yml @@ -1,4 +1,3 @@ --- -#- include: ImageDownload.yml - include: RpmDownload.yml - include: TarBuild.yml diff --git a/roles/self-test/files/rpms/.gitkeep b/roles/self-test/files/rpms/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/roles/self-test/files/rpms/.gitkeep +++ /dev/null diff --git a/roles/self-test/tasks/main.yml b/roles/self-test/tasks/main.yml deleted file mode 100644 index ec4fd69..0000000 --- a/roles/self-test/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: 'copy file to device' - copy: - src: "{{item.src}}" - dest: "{{item.dest}}" - mode: "{{item.mode}}" - with_items: - - { src: "{{ role_path }}/files/", dest: "/tmp/ansible_deploy/self_test", mode: '0755' } - -- name: 'local docker image' - docker_image: - name: "{{item.name}}" - load_path: "{{item.load_path}}" - source: "{{item.source}}" - with_items: - - { name: 'badssl', load_path: '/tmp/ansible_deploy/self_test/images/badssl.tar', source: load } - - { name: 'golang', load_path: '/tmp/ansible_deploy/self_test/images/wpr.tar', source: load } - - { name: 'python', load_path: '/tmp/ansible_deploy/self_test/images/unittest.tar', source: load } - -- name: "install kni rpms from localhost" - yum: - name: - - "/tmp/ansible_deploy/self_test/rpms/{{rpmdict.selftest.fullname}}" - state: present - -- name: 'self-test service start and docker-compose up' - systemd: - name: self-test - enabled: yes - daemon_reload: yes - diff --git a/roles/self-test/files/images/.gitkeep b/roles/tsg-diagnose/files/rpms/.gitkeep index e69de29..e69de29 100644 --- a/roles/self-test/files/images/.gitkeep +++ b/roles/tsg-diagnose/files/rpms/.gitkeep diff --git a/roles/tsg-diagnose/tasks/main.yml b/roles/tsg-diagnose/tasks/main.yml new file mode 100644 index 0000000..980196b --- /dev/null +++ b/roles/tsg-diagnose/tasks/main.yml @@ -0,0 +1,21 @@ +--- +- name: 'copy 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 + |