diff --git a/0005-fix-the-python3-libselinux-dependency.patch b/0005-fix-the-python3-libselinux-dependency.patch new file mode 100644 index 0000000..ce67c1f --- /dev/null +++ b/0005-fix-the-python3-libselinux-dependency.patch @@ -0,0 +1,215 @@ +From fe8dbb66a6d383845d33601f58ed9bf7bfabed1c Mon Sep 17 00:00:00 2001 +From: gitee-cmd +Date: Tue, 22 Feb 2022 22:13:18 +0800 +Subject: [PATCH] fix the python3-libselinux dependency + +--- + .../tasks/install_adoctor_check_executor.yml | 1 + + .../tasks/install_adoctor_check_scheduler.yml | 1 + + .../tasks/install_adoctor_diag_executor.yml | 1 + + .../tasks/install_adoctor_diag_scheduler.yml | 1 + + .../roles/elasticsearch/tasks/install_elasticsearch.yml | 1 + + .../roles/fluentd/tasks/install_fluentd.yml | 1 + + .../roles/gala_gopher/tasks/install_gala_gopher.yml | 1 + + .../roles/gala_ragdoll/tasks/install_gala_ragdoll.yml | 1 + + .../roles/gala_spider/tasks/install_gala_spider.yml | 1 + + .../ansible_handler/roles/kafka/tasks/install_kafka.yml | 1 + + .../ansible_handler/roles/kafka/tasks/start_kafka.yml | 2 +- + .../ansible_handler/roles/mysql/tasks/install_mysql.yml | 1 + + .../roles/node_exporter/tasks/install_node_exporter.yml | 1 + + .../roles/prometheus/tasks/install_prometheus.yml | 1 + + .../ansible_handler/roles/read_config/tasks/main.yml | 8 ++++++++ + .../roles/zookeeper/tasks/install_zookeeper.yml | 1 + + aops-manager/aops_manager/deploy_manager/view.py | 2 +- + 17 files changed, 24 insertions(+), 2 deletions(-) + +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml +index daf4bee8..dcc1de75 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - adoctor-check-executor +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml +index e3315fe9..8085a62c 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - adoctor-check-scheduler +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml +index c7019508..dec4cc6b 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - adoctor-diag-executor +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml +index c833c82f..b0800be3 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - adoctor-diag-scheduler +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml +index 933e7cc5..f8bb1540 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml +@@ -18,4 +18,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - elasticsearch +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml +index b6e2c02a..1ff58a0a 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml +@@ -5,6 +5,7 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - rubygem-fluentd + - rubygem-fluent-plugin-elasticsearch + +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml +index 1e3e89bb..f1431559 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - gala-gopher +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml +index bbcaec3c..09343941 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - python3-gala-ragdoll +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml +index e93a6b73..b4b8e4d0 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml +@@ -5,5 +5,6 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - gala-spider + - python3-gala-spider +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml +index 9a90ca75..6fa8da8f 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml +@@ -18,6 +18,7 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - kafka + + - name: Copy kafka.service file +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml +index 313ef742..9272348a 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml +@@ -8,4 +8,4 @@ + + # Checking the Service Status + - name: Verify kafka is listening on {{ kafka_port }} +- wait_for: host={{ ansible_host }} port={{ kafka_port }} delay=10 timeout=20 ++ wait_for: host={{ ansible_host }} port={{ kafka_port }} delay=20 timeout=40 +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml +index 93733efa..94a0f6a2 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - mysql-server +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml +index 0913e7f2..813da8e6 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - node_exporter +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml +index 3305a673..30adf85b 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml +@@ -5,4 +5,5 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - prometheus2 +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml +index 3067c5be..775f5513 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml +@@ -1,4 +1,12 @@ + --- ++- name: Install python3-libselinux ++ become: true ++ become_user: root ++ dnf: ++ state: latest ++ name: ++ - python3-libselinux ++ + - name: Check that if the file exists + stat: + path: "{{ item.src }}" +diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml +index f47f194a..69f14b47 100644 +--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml ++++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml +@@ -5,6 +5,7 @@ + dnf: + state: latest + name: ++ - python3-libselinux + - zookeeper + + - name: Create Data Dir +diff --git a/aops-manager/aops_manager/deploy_manager/view.py b/aops-manager/aops_manager/deploy_manager/view.py +index 7a687428..86e9332f 100644 +--- a/aops-manager/aops_manager/deploy_manager/view.py ++++ b/aops-manager/aops_manager/deploy_manager/view.py +@@ -199,7 +199,7 @@ class ExecuteTask(Resource): + res = TaskRunner.run_task(task_id, HostKey.key) + inventory.remove_host_vars_in_inventory() + if res: +- LOGGER.error("Task %s execution succeeded.", task_id) ++ LOGGER.info("Task %s execution succeeded.", task_id) + return + LOGGER.error("Task %s execution failed.", task_id) + +-- +2.33.0 + diff --git a/A-Ops.spec b/A-Ops.spec index 9456444..b184561 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,6 +1,6 @@ Name: A-Ops Version: v1.1.1 -Release: 5 +Release: 6 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops @@ -12,7 +12,7 @@ patch0001: 0001-fix-diag-return.patch patch0002: 0002-fix-log-of-task-execution.patch patch0003: 0003-add-permission-control-in-ragdoll.patch patch0004: 0004-fix-logos-instructions-and-size.patch - +patch0005: 0005-fix-the-python3-libselinux-dependency.patch # build for gopher BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel @@ -177,6 +177,7 @@ website for A-Ops, deployed by Nginx %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 +%patch0005 -p1 cp -r A-Ops-web-node-modules/node_modules aops-web/ cp -f $RPM_SOURCE_DIR/vertical-left.png aops-web/src/assets/ cp -f $RPM_SOURCE_DIR/horizontal-left.png aops-web/src/assets/ @@ -500,6 +501,9 @@ fi %changelog +* Tue Feb 22 2022 chemingdao - v1.1.1-6 +- fix the python3-libselinux dependency. + * Thu Sep 30 2021 chemingdao - v1.1.1-5 - Using image source overwrite instead of patching image binaries.