Skip to content

Commit

Permalink
Removed the parameter 'secret'.
Browse files Browse the repository at this point in the history
  • Loading branch information
lgetwan committed Aug 28, 2024
1 parent 2b2fbde commit 06cad7c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
6 changes: 0 additions & 6 deletions plugins/doc_fragments/site_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions plugins/module_utils/site.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/targets/site/tasks/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -18,34 +18,34 @@
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
loop: "{{ outer_item.remote_sites }}"
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"
Expand All @@ -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: |
Expand Down

0 comments on commit 06cad7c

Please sign in to comment.