From 06cad7cbd2748cfb8f3f07fab8fc975201cffb3b Mon Sep 17 00:00:00 2001 From: Lars Getwan Date: Wed, 28 Aug 2024 08:11:22 +0200 Subject: [PATCH] Removed the parameter 'secret'. --- plugins/doc_fragments/site_options.py | 6 ------ plugins/module_utils/site.py | 4 ---- tests/integration/targets/site/tasks/test.yml | 14 +++++++------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/plugins/doc_fragments/site_options.py b/plugins/doc_fragments/site_options.py index c69ba36c4..8c6ce12e6 100644 --- a/plugins/doc_fragments/site_options.py +++ b/plugins/doc_fragments/site_options.py @@ -306,12 +306,6 @@ class ModuleDocFragment(object): - files below C($OMD_ROOT/local/) on the remote site will be removed. type: bool default: true - secret: - description: - - The shared secret used by the central site to authenticate with the - - remote site for configuring Checkmk. - type: str - default: basic_settings: description: - A site's basic settings. diff --git a/plugins/module_utils/site.py b/plugins/module_utils/site.py index 13da5b060..868b2c270 100644 --- a/plugins/module_utils/site.py +++ b/plugins/module_utils/site.py @@ -363,10 +363,6 @@ def get_api_data(self, target_api): ), ), ), - secret=dict( - type="str", - no_log=True, - ), basic_settings=dict( type="dict", options=dict( diff --git a/tests/integration/targets/site/tasks/test.yml b/tests/integration/targets/site/tasks/test.yml index eb59bceb0..04501f728 100644 --- a/tests/integration/targets/site/tasks/test.yml +++ b/tests/integration/targets/site/tasks/test.yml @@ -9,7 +9,7 @@ customer: null when: not ((outer_item.edition == "cme") or (outer_item.edition == "cce")) -- name: "Create remote sites." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create remote sites." ansible.builtin.command: "omd -V {{ outer_item.version }}.{{ outer_item.edition }} create --no-tmpfs --admin-password {{ checkmk_var_automation_secret }} {{ item.site_id }}" args: creates: "/omd/sites/{{ item.site_id }}" @@ -18,21 +18,21 @@ loop_control: label: "{{ item.site_id }}" -- name: "Enable Livestatus of remote sites." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Enable Livestatus of remote sites." ansible.builtin.command: "omd config {{ item.site_id }} set LIVEPROXYD on" when: (download_pass is defined and download_pass | length) or outer_item.edition == "cre" loop: "{{ outer_item.remote_sites }}" loop_control: label: "{{ item.site_id }}" -- name: "Configure Livestatus port of remote sites." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Configure Livestatus port of remote sites." ansible.builtin.command: "omd config {{ item.site_id }} set LIVESTATUS_TCP_PORT {{ item.site_config.status_connection.connection.port }}" when: (download_pass is defined and download_pass | length) or outer_item.edition == "cre" loop: "{{ outer_item.remote_sites }}" loop_control: label: "{{ item.site_id }}" -- name: "Configure Livestatus TLS of remote sites." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Configure Livestatus TLS of remote sites." ansible.builtin.command: "omd config {{ item.site_id }} set LIVESTATUS_TCP_TLS off" when: ((download_pass is defined and download_pass | length) or outer_item.edition == "cre" ) and item.site_config.status_connection.connection.encrypted == true @@ -40,12 +40,12 @@ loop_control: label: "{{ item.site_id }}" -- name: "Start Apache2." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Start Apache2." ansible.builtin.service: name: apache2 state: started -- name: "Start Sites." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Start Sites." ansible.builtin.shell: "omd status -b {{ item.site_id }} || omd start {{ item.site_id }}" register: site_status changed_when: site_status.rc == "0" @@ -54,7 +54,7 @@ loop_control: label: "{{ item.site_id }}" -- name: "Wait for site to be ready." +- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Wait for site to be ready." ansible.builtin.pause: seconds: 5 when: |