Add comments to templates stating that they are managed by puppet

detiber · detiber · commit 5a9294968eee · 2014-11-19T13:21:37.000-05:00
diff --git a/templates/activemq/activemq-network.xml.erb b/templates/activemq/activemq-network.xml.erb
@@ -1,4 +1,7 @@
 <!--
+    Managed by puppet - module openshift-openshift_origin
+
+
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
diff --git a/templates/activemq/activemq.xml.erb b/templates/activemq/activemq.xml.erb
@@ -1,4 +1,7 @@
 <!--
+    Managed by puppet - module openshift-openshift_origin
+
+
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
diff --git a/templates/activemq/jetty-realm.properties.erb b/templates/activemq/jetty-realm.properties.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 ## ---------------------------------------------------------------------------
 ## Licensed to the Apache Software Foundation (ASF) under one or more
 ## contributor license agreements.  See the NOTICE file distributed with
diff --git a/templates/activemq/jetty.xml.erb b/templates/activemq/jetty.xml.erb
@@ -1,4 +1,4 @@
-
+<!-- Managed by puppet - module openshift-openshift_origin -->
     <!--
         Licensed to the Apache Software Foundation (ASF) under one or more contributor
         license agreements. See the NOTICE file distributed with this work for additional
diff --git a/templates/avahi/avahi-daemon.conf.erb b/templates/avahi/avahi-daemon.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
diff --git a/templates/avahi/cname-manager.conf.erb b/templates/avahi/cname-manager.conf.erb
@@ -1,2 +1,2 @@
 KEY_NAME=<%= scope.lookupvar('::hostname') %>
-KEY_VALUE=<%= scope.lookupvar('::domain') %>
+KEY_VALUE=<%= scope.lookupvar('::domain') %>
diff --git a/templates/broker/broker.conf.erb b/templates/broker/broker.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # Domain suffix to use for applications (Must match node config)
 CLOUD_DOMAIN="<%= scope.lookupvar('::openshift_origin::domain') %>"
 # Comma-separated list of valid gear sizes
diff --git a/templates/broker/msg-broker-mcollective.conf.erb b/templates/broker/msg-broker-mcollective.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # Some settings to configure how mcollective handles gear placement on nodes:
 
 # Use districts when placing gears and moving them between hosts. Should be
diff --git a/templates/broker/plugins/auth/basic/openshift-origin-auth-remote-user-basic.conf.erb b/templates/broker/plugins/auth/basic/openshift-origin-auth-remote-user-basic.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authz_user_module modules/mod_authz_user.so
diff --git a/templates/broker/plugins/auth/basic/remote-user.conf.plugin.erb b/templates/broker/plugins/auth/basic/remote-user.conf.plugin.erb
@@ -1 +1,3 @@
+# Managed by puppet - module openshift-openshift_origin
+
 TRUSTED_HEADER="REMOTE_USER"
diff --git a/templates/broker/plugins/auth/kerberos/openshift-origin-auth-remote-user-kerberos.conf.erb b/templates/broker/plugins/auth/kerberos/openshift-origin-auth-remote-user-kerberos.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # Provided by the mod_auth_kerb package
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authz_user_module modules/mod_authz_user.so
diff --git a/templates/broker/plugins/auth/ldap/openshift-origin-auth-remote-user-ldap.conf.erb b/templates/broker/plugins/auth/ldap/openshift-origin-auth-remote-user-ldap.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule ldap_module modules/mod_ldap.so
diff --git a/templates/broker/plugins/auth/mongo/mongo.conf.plugin.erb b/templates/broker/plugins/auth/mongo/mongo.conf.plugin.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 MONGO_REPLICA_SETS=<%= scope.lookupvar('::openshift_origin::mongodb_replicasets') %>
 # Replica set example: "<host-1>:<port-1> <host-2>:<port-2> ..."
 <% if scope.lookupvar('::openshift_origin::mongodb_replicasets') == true %>
diff --git a/templates/broker/quickstarts.json.erb b/templates/broker/quickstarts.json.erb
@@ -106,4 +106,4 @@
     }
         <% req_comma = true %>
     <% end %>
-]
+]
diff --git a/templates/console/console.conf.erb b/templates/console/console.conf.erb
@@ -1,3 +1,4 @@
+# Managed by puppet - module openshift-openshift_origin
 #
 # The base URL for the OpenShift REST API on the broker. If your
 # environment is configured with a virtual host security module that
diff --git a/templates/console/plugins/auth/basic/openshift-origin-auth-remote-user-basic.conf.erb b/templates/console/plugins/auth/basic/openshift-origin-auth-remote-user-basic.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authz_user_module modules/mod_authz_user.so
diff --git a/templates/console/plugins/auth/kerberos/openshift-origin-auth-remote-user-kerberos.conf.erb b/templates/console/plugins/auth/kerberos/openshift-origin-auth-remote-user-kerberos.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule auth_kerb_module modules/mod_auth_kerb.so
diff --git a/templates/console/plugins/auth/ldap/openshift-origin-auth-remote-user-ldap.conf.erb b/templates/console/plugins/auth/ldap/openshift-origin-auth-remote-user-ldap.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule ldap_module modules/mod_ldap.so
diff --git a/templates/dhclient_conf.erb b/templates/dhclient_conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 prepend domain-name-servers <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %>;
 supersede host-name "<%= @hostname %>";
 supersede domain-name "<%= scope.lookupvar('::openshift_origin::domain') %>";
diff --git a/templates/mcollective/mcollective-client.cfg.erb b/templates/mcollective/mcollective-client.cfg.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 main_collective = mcollective
 collectives = mcollective
 libdir = <%= scope.lookupvar('::openshift_origin::params::ruby_scl_path_prefix') %>/usr/libexec/mcollective
diff --git a/templates/mcollective/mcollective-server.cfg.erb b/templates/mcollective/mcollective-server.cfg.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 main_collective = mcollective
 collectives = mcollective
 libdir = <%= scope.lookupvar('::openshift_origin::params::ruby_scl_path_prefix') %>/usr/libexec/mcollective
diff --git a/templates/named/forwarders.conf.erb b/templates/named/forwarders.conf.erb
@@ -1 +1,3 @@
+// Managed by puppet - module openshift-openshift_origin
+
 forwarders { <%= scope.lookupvar('::openshift_origin::conf_nameserver_upstream_dns').join("; ") %>; };
diff --git a/templates/named/named.conf.erb b/templates/named/named.conf.erb
@@ -1,10 +1,11 @@
+// Managed by puppet - module openshift-openshift_origin
+
 // named.conf
 //
 // Provided by Red Hat bind package to configure the ISC BIND named(8) DNS
 // server as a caching only nameserver (as a localhost DNS resolver only).
 //
 // See /usr/share/doc/bind*/sample/ for example named configuration files.
-//
 
 options {
     listen-on port 53 { any; };
@@ -32,7 +33,7 @@ logging {
 
 // use the default rndc key
 include "/etc/rndc.key";
- 
+
 controls {
     inet 127.0.0.1 port 953
     allow { 127.0.0.1; } keys { "rndc-key"; };
diff --git a/templates/named/named.key.erb b/templates/named/named.key.erb
@@ -1,3 +1,5 @@
+// Managed by puppet - module openshift-openshift_origin
+
 key <%= scope.lookupvar('::openshift_origin::domain') %> {
   algorithm <%= scope.lookupvar('::openshift_origin::bind_key_algorithm') %>;
   secret "<%= scope.lookupvar('::openshift_origin::bind_key') %>";
diff --git a/templates/named/oo_infrastructure.conf.erb b/templates/named/oo_infrastructure.conf.erb
@@ -1,3 +1,5 @@
+// Managed by puppet - module openshift-openshift_origin
+
 // define a zone for infrastructure hosts
 <% unless scope.lookupvar('::openshift_origin::dns_infrastructure_key').empty? -%>
 include "<%= scope.lookupvar('::openshift_origin::dns_infrastructure_zone') %>.key";
diff --git a/templates/named/oo_infrastructure_key.erb b/templates/named/oo_infrastructure_key.erb
@@ -1,3 +1,5 @@
+// Managed by puppet - module openshift-openshift_origin
+
 key <%= scope.lookupvar('::openshift_origin::dns_infrastructure_zone') %> {
   algorithm <%= scope.lookupvar('::openshift_origin::dns_infrastructure_key_algorithm') %>;
   secret "<%= scope.lookupvar('::openshift_origin::dns_infrastructure_key') %>";
diff --git a/templates/node/node.conf.erb b/templates/node/node.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # These should not be left at default values, even for a demo.
 # "PUBLIC" networking values are ones that end-users should be able to reach.
 PUBLIC_HOSTNAME="<%= scope.lookupvar('::openshift_origin::node_hostname') %>"                         # The node host's public hostname
diff --git a/templates/node/resource_limits.conf.erb b/templates/node/resource_limits.conf.erb
@@ -1,3 +1,4 @@
+# Managed by puppet - module openshift-openshift_origin
 #
 # Limit resources for a new OpenShift guest user on a node
 #
diff --git a/templates/node/watchman.erb b/templates/node/watchman.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+#
 # Number of restarts to attempt before waiting RETRY_PERIOD
 GEAR_RETRIES=<%= scope.lookupvar('::openshift_origin::conf_node_watchman_gearretries') %>
 
diff --git a/templates/plugins/container/namespace-d-shm.conf.erb b/templates/plugins/container/namespace-d-shm.conf.erb
@@ -1 +1,3 @@
-/dev/shm  tmpfs  tmpfs:mntopts=size=5M:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
+# Managed by puppet - module openshift-openshift_origin
+
+/dev/shm  tmpfs  tmpfs:mntopts=size=5M:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
diff --git a/templates/plugins/container/namespace-d-tmp.conf.erb b/templates/plugins/container/namespace-d-tmp.conf.erb
@@ -1 +1,3 @@
-/tmp        $HOME/.tmp/      user:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
+# Managed by puppet - module openshift-openshift_origin
+
+/tmp        $HOME/.tmp/      user:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
diff --git a/templates/plugins/container/namespace-d-vartmp.conf.erb b/templates/plugins/container/namespace-d-vartmp.conf.erb
@@ -1 +1,3 @@
-/var/tmp    $HOME/.tmp/   user:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
+# Managed by puppet - module openshift-openshift_origin
+
+/var/tmp    $HOME/.tmp/   user:iscript=/usr/sbin/oo-namespace-init <%= scope.lookupvar('::openshift_origin::plugins::container::selinux::os_all_unmanaged_users').flatten.join(',') %>
diff --git a/templates/plugins/frontend/apache/broker_servername.conf.erb b/templates/plugins/frontend/apache/broker_servername.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # Feel free to change this as desired. It serves to provide
 # a consistent default ServerName for all vhosts.
 
diff --git a/templates/plugins/frontend/apache/cartridge_files.conf.erb b/templates/plugins/frontend/apache/cartridge_files.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 #
 # Cartridges may expose files through the FrontendHttpServer connect call.
 #
diff --git a/templates/plugins/frontend/apache/node_servername.conf.erb b/templates/plugins/frontend/apache/node_servername.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 # Feel free to change this as desired. It serves to provide
 # a consistent default ServerName for all vhosts.
 
diff --git a/templates/resolv.conf.erb b/templates/resolv.conf.erb
@@ -1,3 +1,5 @@
+# Managed by puppet - module openshift-openshift_origin
+
 search <%= scope.lookupvar('::openshift_origin::domain') %>
 nameserver <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %>
 <%= scope.lookupvar('::openshift_origin::conf_nameserver_upstream_dns').map{|ns| "nameserver #{ns}"}.join("\n") %>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`## ---------------------------------------------------------------------------`
`2`	`4`	`## Licensed to the Apache Software Foundation (ASF) under one or more`
`3`	`5`	`## contributor license agreements. See the NOTICE file distributed with`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+<!-- Managed by puppet - module openshift-openshift_origin -->`
`2`	`2`	`<!--`
`3`	`3`	`Licensed to the Apache Software Foundation (ASF) under one or more contributor`
`4`	`4`	`license agreements. See the NOTICE file distributed with this work for additional`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`# This file is part of avahi.`
`2`	`4`	`#`
`3`	`5`	`# avahi is free software; you can redistribute it and/or modify it`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`KEY_NAME=<%= scope.lookupvar('::hostname') %>`
`2`		`-KEY_VALUE=<%= scope.lookupvar('::domain') %>`
	`2`	`+KEY_VALUE=<%= scope.lookupvar('::domain') %>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`# Domain suffix to use for applications (Must match node config)`
`2`	`4`	`CLOUD_DOMAIN="<%= scope.lookupvar('::openshift_origin::domain') %>"`
`3`	`5`	`# Comma-separated list of valid gear sizes`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`# Some settings to configure how mcollective handles gear placement on nodes:`
`2`	`4`
`3`	`5`	`# Use districts when placing gears and moving them between hosts. Should be`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`LoadModule auth_basic_module modules/mod_auth_basic.so`
`2`	`4`	`LoadModule authn_file_module modules/mod_authn_file.so`
`3`	`5`	`LoadModule authz_user_module modules/mod_authz_user.so`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+# Managed by puppet - module openshift-openshift_origin`
	`2`	`+`
`1`	`3`	`TRUSTED_HEADER="REMOTE_USER"`