Skip to content

Commit 5413d52

Browse files
Carlos KonstanskiCarlos Konstanski
authored andcommitted
Support for only-cross-site
1 parent e9ac501 commit 5413d52

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

examples/nagios_.jinja2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
{% set named_object = object_name in named_objects %}
55
{% for resource in resources %}
66
{% if resource.exported %}
7-
{% if "no-cross-site" not in resource.tags %}
8-
{% if "garb" not in resource.name %}
7+
{% if "only-cross-site" not in resource.tags or localsite == "false" %}
98
define {{object_name}} {
109
{% if named_object %}
1110
{{object_name}}_name {{resource.name}}
@@ -29,5 +28,4 @@ define {{object_name}} {
2928
}
3029
{% endif %}
3130
{% endif %}
32-
{% endif %}
3331
{% endfor %}

puppetdb_stencil.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
loader=LOADER, extensions=EXTENSIONS)
2525

2626

27-
def render_resources(database, resource_type, template_names):
27+
def render_resources(database, resource_type, localsite, template_names):
2828
"""
2929
Render resources of the given type. They are queried from the given
3030
database and rendered using the first template from template_names that can
@@ -38,7 +38,7 @@ def render_resources(database, resource_type, template_names):
3838
else:
3939
return template.render(resource_type=resource_type,
4040
resources=resources, metaparams=METAPARAMS,
41-
env=os.environ)
41+
env=os.environ, localsite=localsite)
4242

4343

4444
def main():
@@ -51,6 +51,7 @@ def main():
5151
parser.add_argument('--debug', '-d', action='store_true')
5252
parser.add_argument('--host', '-H', default='localhost')
5353
parser.add_argument('--port', '-p', default='8080')
54+
parser.add_argument('--localsite', '-l', default='true')
5455

5556
args = parser.parse_args()
5657
logging.basicConfig(level=logging.DEBUG if args.debug else logging.WARN)
@@ -61,7 +62,7 @@ def main():
6162
templates = ['{0}.jinja2'.format(resource_type)]
6263
if args.templates:
6364
templates += args.templates
64-
print(render_resources(database, resource_type, templates))
65+
print(render_resources(database, resource_type, args.localsite, templates))
6566

6667

6768
if __name__ == '__main__':

0 commit comments

Comments
 (0)