Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
icinga
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
webarch
icinga
Commits
350575e9
Verified
Commit
350575e9
authored
11 months ago
by
Chris Croome
Browse files
Options
Downloads
Patches
Plain Diff
fix for remote nodes
parent
1e393676
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#33249
passed
11 months ago
Stage: bookworm
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-10
1 addition, 10 deletions
.gitlab-ci.yml
.pre-commit-config.yaml
+2
-2
2 additions, 2 deletions
.pre-commit-config.yaml
tasks/master_agents.yml
+6
-2
6 additions, 2 deletions
tasks/master_agents.yml
with
9 additions
and
14 deletions
.gitlab-ci.yml
+
1
−
10
View file @
350575e9
...
...
@@ -30,21 +30,12 @@ before_script:
-
which molecule
-
molecule --version
stages
:
-
lint
-
bookworm
# - bullseye
bookworm
:
image
:
registry.git.coop/webarch/containers/images/bookworm:20240
209
image
:
registry.git.coop/webarch/containers/images/bookworm:20240
426
stage
:
bookworm
script
:
-
pre-commit install
-
pre-commit run --all-files
-
molecule test --all
# The Bullseye test run OK but Molecule never completes
# https://github.com/ansible/molecule/discussions/4020
# bullseye:
# image: registry.git.coop/webarch/containers/images/bullseye:20240209
# stage: bullseye
# script:
# - molecule test
...
This diff is collapsed.
Click to expand it.
.pre-commit-config.yaml
+
2
−
2
View file @
350575e9
...
...
@@ -25,7 +25,7 @@ repos:
-
templates
# https://github.com/jackdewinter/pymarkdown/releases
-
repo
:
https://github.com/jackdewinter/pymarkdown.git
rev
:
v0.9.1
8
rev
:
v0.9.1
9
hooks
:
-
id
:
pymarkdown
name
:
Markdown Lint
...
...
@@ -34,7 +34,7 @@ repos:
-
README.md
# https://github.com/ansible/ansible-lint/releases
-
repo
:
https://github.com/ansible/ansible-lint.git
rev
:
v24.2.
2
rev
:
v24.2.
3
hooks
:
-
id
:
ansible-lint
name
:
Ansible Lint
...
...
This diff is collapsed.
Click to expand it.
tasks/master_agents.yml
+
6
−
2
View file @
350575e9
...
...
@@ -115,13 +115,17 @@
tags
:
-
icinga
-
name
:
Loop though the agent node hosts including tasks to generate a config file for each
-
name
:
Loop though the agent node hosts including tasks to generate a config file for each
host in the current play plus and remote hosts
ansible.builtin.include_tasks
:
host.yml
loop
:
"
{{
icinga_agent_node_hosts_required
}}"
loop_control
:
loop_var
:
icinga_host
label
:
"
{{
icinga_host
}}"
when
:
icinga_host in ansible_play_hosts
when
:
>-
( icinga_host in ansible_play_hosts ) or
( ( groups['icinga_remote_nodes'] is defined ) and
( groups['icinga_remote_nodes'] != [] ) and
( icinga_host in groups['icinga_remote_nodes'] ) )
# TODO
# - name: Check that agent node hosts are connected
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment