Yuvipanda has submitted this change and it was merged.
Change subject: Pass in config object to generators
......................................................................
Pass in config object to generators
Also emit a default hostgroup for all hosts
Change-Id: Ifaf2643b8fc03a8e8e95b3ed7eba31e4540fe954
---
M shingen/generators/generator.py
M shingen/generators/hostgroups.py
M shingen/generators/hosts.py
3 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/shingen/generators/generator.py b/shingen/generators/generator.py
index ad6f9f4..1e3792c 100644
--- a/shingen/generators/generator.py
+++ b/shingen/generators/generator.py
@@ -28,7 +28,7 @@
config_objects = []
for instance in instances:
for generator in self.instance_generators:
- co = generator(project, instance)
+ co = generator(self.config, project, instance)
config_objects.append(co)
hosts_config_path = '%s/%s.cfg' % (
self.config['base_path'], project
@@ -37,7 +37,7 @@
project_cos = []
for generator in self.project_generators:
- co = generator(project, instances, config_objects)
+ co = generator(self.config, project, instances, config_objects)
project_cos.append(co)
projects_config_path = '%s/project-%s.cfg' % (
self.config['base_path'], project
diff --git a/shingen/generators/hostgroups.py b/shingen/generators/hostgroups.py
index 03af341..1fab08e 100644
--- a/shingen/generators/hostgroups.py
+++ b/shingen/generators/hostgroups.py
@@ -1,6 +1,6 @@
from ..shinkenconfig import ConfigObject
-def generate_hostgroups_config(project_name, instances, config_objects):
+def generate_hostgroups_config(config, project_name, instances,
config_objects):
co = ConfigObject('hostgroup')
co.properties['hostgroup_name'] = project_name
co.properties['alias'] = project_name
diff --git a/shingen/generators/hosts.py b/shingen/generators/hosts.py
index 4d71406..8cb5d46 100644
--- a/shingen/generators/hosts.py
+++ b/shingen/generators/hosts.py
@@ -1,10 +1,11 @@
from ..shinkenconfig import ConfigObject
-def generate_host_config(project_name, instance):
+def generate_host_config(config, project_name, instance):
co = ConfigObject('host')
co.properties['use'] = 'generic-host'
co.properties['host_name'] = instance['name']
co.properties['address'] = instance['ip'][0]
- co.properties['hostgroups'] = project_name
+ projects = [project_name, config.get('default-hostgroup', 'labshost')]
+ co.properties['hostgroups'] = ','.join(projects)
co.properties['contact_groups'] = project_name
return co
--
To view, visit https://gerrit.wikimedia.org/r/172335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaf2643b8fc03a8e8e95b3ed7eba31e4540fe954
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/shinkengen
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
