From 1e3b7998904919794b6fd194e3051efe434d5f69 Mon Sep 17 00:00:00 2001 From: YangYunYi Date: Sat, 11 Sep 2021 10:20:44 +0000 Subject: [PATCH] add ansible playbook patch (cherry picked from commit e27e37f5799c6b270e88062708627a991050cace) --- ...odify-deploymanager-ansible-playbook.patch | 55 +++++++++++++++++++ A-Ops.spec | 7 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-modify-deploymanager-ansible-playbook.patch diff --git a/0001-modify-deploymanager-ansible-playbook.patch b/0001-modify-deploymanager-ansible-playbook.patch new file mode 100644 index 0000000..9fe4db1 --- /dev/null +++ b/0001-modify-deploymanager-ansible-playbook.patch @@ -0,0 +1,55 @@ +diff --git a/adoctor-check-executor/adoctor_check_executor/check_rule_plugins/expression_rule.py b/adoctor-check-executor/adoctor_check_executor/check_rule_plugins/expression_rule.py +index a0e042185becf59cbecdb4713366ce3b30bc7c5a..a89b273c5b5056f159b9157ef2f9cf8843523a6b 100644 +--- a/adoctor-check-executor/adoctor_check_executor/check_rule_plugins/expression_rule.py ++++ b/adoctor-check-executor/adoctor_check_executor/check_rule_plugins/expression_rule.py +@@ -94,5 +94,4 @@ class ExpressionCheckRule(CheckRulePlugin): + if not self._syntax_tree: + raise CheckItemError("syntax tree is None") + ret = self._syntax_tree.calculate(data_backpack) +- LOGGER.debug("judge condition result %s", ret) + return ret +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/start_adoctor_check_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/start_adoctor_check_scheduler.yml +index c43ebee7c3e3241c986b8e717127f7af617fda5f..9d5a4c2ffe82a044ba75f035ab3b5217653aabf3 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/start_adoctor_check_scheduler.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/start_adoctor_check_scheduler.yml +@@ -8,4 +8,4 @@ + + # Checking the Service Status + - name: verify adoctor_check_scheduler is listening on {{ check_scheduler_port }} +- wait_for: host={{ ansible_host }} port={{ check_scheduler_port }} timeout=1 ++ wait_for: port={{ check_scheduler_port }} timeout=1 +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/start_adoctor_diag_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/start_adoctor_diag_scheduler.yml +index c47a64b711628d2401afa6313c8d2df1cb7adb25..2ec66494fab6ad28111d6e3e6061f3b6cd0543d9 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/start_adoctor_diag_scheduler.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/start_adoctor_diag_scheduler.yml +@@ -8,4 +8,4 @@ + + # Checking the Service Status + - name: verify adoctor_diag_scheduler is listening on {{ diag_scheduler_port }} +- wait_for: host={{ ansible_host }} port={{ diag_scheduler_port }} timeout=1 ++ wait_for: port={{ diag_scheduler_port }} timeout=1 +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/start_gala_ragdoll.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/start_gala_ragdoll.yml +index e6710a12ba9542d178a2e425ab8f776636444a58..f43fba391cf80c03eb42483709191fe3b99bd2e8 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/start_gala_ragdoll.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/start_gala_ragdoll.yml +@@ -2,7 +2,7 @@ + - name: Start gala ragdoll + become: true + become_user: root +- service: ++ service: + name: gala-ragdoll + state: restarted + +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/vars/kafka_vars.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/vars/kafka_vars.yml +index 0e017e76ac25b8cfce25dd448a4f70acfeae8c1a..1d8492d0c0094b76c033f93ee19b908fbe926f18 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/vars/kafka_vars.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/vars/kafka_vars.yml +@@ -15,5 +15,5 @@ zk_client_port: 2181 + # elasticsearch repo config + repo_name: "Kafka" + repo_description: "kafka repository" +-repo_base_url: "https://repo.openeuler.org/openEuler-20.03-LTS-SP2/everything/$baseurl" ++repo_base_url: "https://repo.openeuler.org/openEuler-20.03-LTS-SP2/everything/$basearch" + repo_file: "kafka" +\ No newline at end of file \ No newline at end of file diff --git a/A-Ops.spec b/A-Ops.spec index f899675..d6dc29a 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,12 +1,13 @@ #needsrootforbuild Name: A-Ops Version: v1.0.2 -Release: 1 +Release: 2 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops Source0: %{name}-%{version}.tar.gz Source1: A-Ops-web-node-modules.tar.gz +patch0001: 0001-modify-deploymanager-ansible-playbook.patch # build for gopher BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel @@ -166,6 +167,7 @@ website for A-Ops, deployed by Nginx %prep %setup %setup -T -D -a 1 +%patch0001 -p1 cp -r A-Ops-web-node-modules/node_modules aops-web/ # prepare for web @@ -494,6 +496,9 @@ fi %changelog +* Tue Sep 11 2021 yangyunyi - v1.0.2-2 +- modify ansible playbook + * Tue Sep 7 2021 zhaoyuxing - v1.0.2-1 - add gala-spider in spec