summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2020-10-19 20:55:59 +0800
committerfumingwei <[email protected]>2020-10-19 20:55:59 +0800
commit344c734f7061087b8126079e5b5fd068cd50b2bf (patch)
tree244c9b14e84c073fd12dda98eb501c086a58f63c
parented6f5c3d3b9fa7f07fa6105943eaaacee9c22471 (diff)
parentaeee8afab998da258ec6acbeedd25f0926c69712 (diff)
Merge branch 'tsg-version20.11.rc1-deploy' of https://git.mesalab.cn/tsg/tsg-scripts into tsg-version20.11.rc1-deploy
-rw-r--r--roles/app_global/files/app-sketch-global-1.0.2.20200918.ab44d17-1.el7.x86_64.rpmbin105068 -> 0 bytes
-rw-r--r--roles/app_global/files/app-sketch-global-1.0.3.202010.a7b2e40-1.el7.x86_64.rpmbin0 -> 105076 bytes
-rw-r--r--roles/app_global/tasks/main.yml2
-rw-r--r--roles/certstore/files/certstore-2.1.2.20200923.a36312c-1.el7.x86_64.rpmbin2123332 -> 0 bytes
-rw-r--r--roles/certstore/files/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpmbin0 -> 2123112 bytes
-rw-r--r--roles/certstore/tasks/main.yml2
6 files changed, 2 insertions, 2 deletions
diff --git a/roles/app_global/files/app-sketch-global-1.0.2.20200918.ab44d17-1.el7.x86_64.rpm b/roles/app_global/files/app-sketch-global-1.0.2.20200918.ab44d17-1.el7.x86_64.rpm
deleted file mode 100644
index be99755..0000000
--- a/roles/app_global/files/app-sketch-global-1.0.2.20200918.ab44d17-1.el7.x86_64.rpm
+++ /dev/null
Binary files differ
diff --git a/roles/app_global/files/app-sketch-global-1.0.3.202010.a7b2e40-1.el7.x86_64.rpm b/roles/app_global/files/app-sketch-global-1.0.3.202010.a7b2e40-1.el7.x86_64.rpm
new file mode 100644
index 0000000..fe7937b
--- /dev/null
+++ b/roles/app_global/files/app-sketch-global-1.0.3.202010.a7b2e40-1.el7.x86_64.rpm
Binary files differ
diff --git a/roles/app_global/tasks/main.yml b/roles/app_global/tasks/main.yml
index acd0b9a..fa90ab4 100644
--- a/roles/app_global/tasks/main.yml
+++ b/roles/app_global/tasks/main.yml
@@ -7,7 +7,7 @@
yum:
name:
- /tmp/ansible_deploy/emqx-centos7-v4.1.2.x86_64.rpm
- - /tmp/ansible_deploy/app-sketch-global-1.0.2.20200918.ab44d17-1.el7.x86_64.rpm
+ - /tmp/ansible_deploy/app-sketch-global-1.0.3.202010.a7b2e40-1.el7.x86_64.rpm
state: present
- name: "template the app_sketch_global.conf"
diff --git a/roles/certstore/files/certstore-2.1.2.20200923.a36312c-1.el7.x86_64.rpm b/roles/certstore/files/certstore-2.1.2.20200923.a36312c-1.el7.x86_64.rpm
deleted file mode 100644
index 3514d39..0000000
--- a/roles/certstore/files/certstore-2.1.2.20200923.a36312c-1.el7.x86_64.rpm
+++ /dev/null
Binary files differ
diff --git a/roles/certstore/files/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpm b/roles/certstore/files/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpm
new file mode 100644
index 0000000..492e276
--- /dev/null
+++ b/roles/certstore/files/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpm
Binary files differ
diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml
index bc00e5c..d970488 100644
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -10,7 +10,7 @@
- name: install certstore
yum:
name:
- - /tmp/ansible_deploy/certstore-2.1.2.20200923.a36312c-1.el7.x86_64.rpm
+ - /tmp/ansible_deploy/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpm
state: present
- name: template certstore configure file