Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172335
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
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/shinkengen
refs/changes/35/172335/1
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..6e3c52b 100644
--- a/shingen/generators/hostgroups.py
+++ b/shingen/generators/hostgroups.py
@@ -1,7 +1,8 @@
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
+ projects = [project_name, config.get('default-hostgroup', 'labshost')]
+ co.properties['hostgroup_name'] = ','.join(projects)
co.properties['alias'] = project_name
return co
--
To view, visit https://gerrit.wikimedia.org/r/172335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaf2643b8fc03a8e8e95b3ed7eba31e4540fe954
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/shinkengen
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
