Skip to content

Commit 8d78c27

Browse files
author
Klavs Klavsen
committed
Merge pull request 'Add user obmondo-admin and enable monitoring in noop once the subscription is added for the server' (#1351) from obmoneo_admin_monitoring into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1351
2 parents ae511e0 + 92bb25e commit 8d78c27

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

modules/enableit/common/data/subscriptions/basic.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ common::system::updates::noop_value: false
1111

1212
common::setup::obmondo_admin::manage: true
1313
common::setup::obmondo_admin::enable: true
14-
14+
common::setup::obmondo_admin::noop_value: false
15+
common::monitor:noop_value: false
1516
common::openvox::noop_value: false

modules/enableit/common/data/subscriptions/bronze.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ common::system::updates::noop_value: false
1111

1212
common::setup::obmondo_admin::manage: true
1313
common::setup::obmondo_admin::enable: true
14-
14+
common::setup::obmondo_admin::noop_value: false
15+
common::monitor:noop_value: false
1516
common::openvox::noop_value: false

modules/enableit/common/data/subscriptions/gold.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ common::system::updates::noop_value: false
1111

1212
common::setup::obmondo_admin::manage: true
1313
common::setup::obmondo_admin::enable: true
14-
14+
common::setup::obmondo_admin::noop_value: false
15+
common::monitor:noop_value: false
1516
common::openvox::noop_value: false

modules/enableit/common/data/subscriptions/platinum.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ common::system::updates::noop_value: false
1111

1212
common::setup::obmondo_admin::manage: true
1313
common::setup::obmondo_admin::enable: true
14-
14+
common::setup::obmondo_admin::noop_value: false
15+
common::monitor:noop_value: false
1516
common::openvox::noop_value: false

modules/enableit/common/data/subscriptions/silver.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ common::system::updates::noop_value: false
1111

1212
common::setup::obmondo_admin::manage: true
1313
common::setup::obmondo_admin::enable: true
14-
14+
common::setup::obmondo_admin::noop_value: false
15+
common::monitor:noop_value: false
1516
common::openvox::noop_value: false

modules/enableit/common/manifests/setup/obmondo_admin.pp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
) {
1919
contain common::setup
2020

21+
File {
22+
noop => $noop_value,
23+
}
24+
2125
if $manage {
2226
$_enable = $::obmondo_monitor and $enable #lint:ignore:top_scope_facts
2327
$__opt_dir = $common::setup::__opt_dir
@@ -28,7 +32,6 @@
2832
file {
2933
default:
3034
ensure => stdlib::ensure($_enable, 'directory'),
31-
noop => $noop_value,
3235
;
3336

3437
$_home_admin:

0 commit comments

Comments
 (0)