update version to v1.2.0
This commit is contained in:
parent
146026a641
commit
939b0032f1
@ -1,28 +0,0 @@
|
||||
From e6b2a47ac13080a2e4eed63d7e8972c95307d04c Mon Sep 17 00:00:00 2001
|
||||
From: wenxin <shusheng.wen@outlook.com>
|
||||
Date: Mon, 5 Dec 2022 23:35:28 +0800
|
||||
Subject: [PATCH] update delete host
|
||||
|
||||
---
|
||||
zeus/host_manager/view.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/zeus/host_manager/view.py b/zeus/host_manager/view.py
|
||||
index ecb046c..ed2de8c 100644
|
||||
--- a/zeus/host_manager/view.py
|
||||
+++ b/zeus/host_manager/view.py
|
||||
@@ -172,7 +172,10 @@ class DeleteHost(BaseResponse):
|
||||
Returns:
|
||||
dict: response body
|
||||
"""
|
||||
- return jsonify(self.handle_request(DeleteHostSchema, self))
|
||||
+ return jsonify(self.handle_request_db(DeleteHostSchema,
|
||||
+ HostProxy(),
|
||||
+ 'delete_host',
|
||||
+ SESSION))
|
||||
|
||||
|
||||
class GetHost(BaseResponse):
|
||||
--
|
||||
2.37.1.windows.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 0be5de0e26482b476b383c473a4b497fe2b955dc Mon Sep 17 00:00:00 2001
|
||||
From: gongzt <gong_zhengtang@163.com>
|
||||
Date: Wed, 21 Dec 2022 11:31:10 +0800
|
||||
Subject: [PATCH] disabled mysql installed checked
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
aops-zeus | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/aops-zeus b/aops-zeus
|
||||
index 0a755c3..76aea5b 100755
|
||||
--- a/aops-zeus
|
||||
+++ b/aops-zeus
|
||||
@@ -7,7 +7,7 @@ MANAGER_CONFIG_FILE=$SYS_PATH/zeus.ini
|
||||
function main() {
|
||||
if [ "${OPERATION}" = "start" ]; then
|
||||
create_config_file "${MANAGER_CONFIG_FILE}" "zeus"
|
||||
- check_mysql_installed "${MANAGER_CONFIG_FILE}"
|
||||
+ # check_mysql_installed "${MANAGER_CONFIG_FILE}"
|
||||
fi
|
||||
start_or_stop_service "${MANAGER_CONSTANT}"
|
||||
exit $?
|
||||
--
|
||||
Gitee
|
||||
@ -1,25 +0,0 @@
|
||||
From d3c4a082f1436b47601d1e3c8e905f4c6032e112 Mon Sep 17 00:00:00 2001
|
||||
From: wenxin <shusheng.wen@outlook.com>
|
||||
Date: Tue, 27 Dec 2022 11:12:39 +0800
|
||||
Subject: [PATCH] Modify uwsgi configuration fields
|
||||
|
||||
---
|
||||
conf/zeus.ini | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/conf/zeus.ini b/conf/zeus.ini
|
||||
index ab3eabd..0564893 100644
|
||||
--- a/conf/zeus.ini
|
||||
+++ b/conf/zeus.ini
|
||||
@@ -7,6 +7,8 @@ wsgi-file=manage.py
|
||||
daemonize=/var/log/aops/uwsgi/zeus.log
|
||||
http-timeout=600
|
||||
harakiri=600
|
||||
+processes=2
|
||||
+threads=4
|
||||
|
||||
[mysql]
|
||||
ip=127.0.0.1
|
||||
--
|
||||
Gitee
|
||||
|
||||
Binary file not shown.
BIN
aops-zeus-v1.2.0.tar.gz
Normal file
BIN
aops-zeus-v1.2.0.tar.gz
Normal file
Binary file not shown.
@ -1,18 +1,17 @@
|
||||
Name: aops-zeus
|
||||
Version: v1.1.1
|
||||
Release: 4
|
||||
Version: v1.2.0
|
||||
Release: 1
|
||||
Summary: A host and user manager service which is the foundation of aops.
|
||||
License: MulanPSL2
|
||||
URL: https://gitee.com/openeuler/%{name}
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0001: 0001-update-delete-host.patch
|
||||
Patch0002: 0002-disabled-mysql-installed-checked.patch
|
||||
Patch0003: 0003-modify-uwsgi-configuration-file-fields.patch
|
||||
|
||||
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: aops-vulcanus >= v1.0.0
|
||||
Requires: aops-vulcanus >= v1.2.0
|
||||
Requires: python3-marshmallow >= 3.13.0 python3-flask python3-flask-restful
|
||||
Requires: python3-requests python3-uWSGI python3-sqlalchemy python3-werkzeug python3-PyMySQL
|
||||
Requires: python3-paramiko >= 2.11.0 python3-redis python3-prometheus-api-client
|
||||
Provides: aops-zeus
|
||||
Conflicts: aops-manager
|
||||
|
||||
@ -22,7 +21,7 @@ A host and user manager service which is the foundation of aops.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
%autosetup -n %{name}-%{version}
|
||||
|
||||
|
||||
# build for aops-zeus
|
||||
@ -43,6 +42,10 @@ A host and user manager service which is the foundation of aops.
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 17 2023 wenixn<shusheng.wen@outlook.com> - v1.2.0-1
|
||||
- update the call method of ceres; add function how to add host from web
|
||||
- add api: update host info
|
||||
|
||||
* Tue Dec 27 2022 wenxin<shusheng.wen@outlook.com> - v1.1.1-4
|
||||
- Modify uwsgi configuration file fields
|
||||
|
||||
@ -50,14 +53,14 @@ A host and user manager service which is the foundation of aops.
|
||||
- disabled mysql installed checked
|
||||
|
||||
* Tue Dec 06 2022 wenxin<shusheng.wen@outlook.com> - v1.1.1-2
|
||||
- update delete host, remove the judgment about the workflow
|
||||
- update delete host, remove the judgment about the workflow
|
||||
|
||||
* Fri Dec 02 2022 wenxin<shusheng.wen@outlook.com> - v1.1.1-1
|
||||
- set timeout for cve scan,cve fix ,repo set
|
||||
|
||||
* Fri Nov 25 2022 wenxin<shusheng.wen@outlook.com> - v1.1.0-1
|
||||
- remove test cases that use the responses module
|
||||
- remove check_es_installed
|
||||
- remove test cases that use the responses module
|
||||
- remove check_es_installed
|
||||
- add cve cve fix, add cve cve scan
|
||||
|
||||
* Tue Nov 22 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.0.0-1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user