diff options
author | Thomas Wiest <twiest@redhat.com> | 2015-05-26 11:58:50 -0400 |
---|---|---|
committer | Thomas Wiest <twiest@redhat.com> | 2015-05-26 11:58:50 -0400 |
commit | 09e41be0eb83e24f284b84015bb1abbd25f23dff (patch) | |
tree | de2fa359c07bc971ce27c5ac4c0cd2a649937ef7 /roles/atomic_proxy/templates/puppet | |
parent | ce6a15b62755e10cfa31628e5c9e430ef876c1ff (diff) | |
download | openshift-09e41be0eb83e24f284b84015bb1abbd25f23dff.tar.gz openshift-09e41be0eb83e24f284b84015bb1abbd25f23dff.tar.bz2 openshift-09e41be0eb83e24f284b84015bb1abbd25f23dff.tar.xz openshift-09e41be0eb83e24f284b84015bb1abbd25f23dff.zip |
removed references to atomic proxy.
Diffstat (limited to 'roles/atomic_proxy/templates/puppet')
-rw-r--r-- | roles/atomic_proxy/templates/puppet/puppet.conf.j2 | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/roles/atomic_proxy/templates/puppet/puppet.conf.j2 b/roles/atomic_proxy/templates/puppet/puppet.conf.j2 deleted file mode 100644 index 9731ff168..000000000 --- a/roles/atomic_proxy/templates/puppet/puppet.conf.j2 +++ /dev/null @@ -1,40 +0,0 @@ -[main] - # we need to override the host name of the container - certname = ctr-proxy.{{ oo_env }}.rhcloud.com - - # The Puppet log directory. - # The default value is '$vardir/log'. - logdir = /var/log/puppet - - # Where Puppet PID files are kept. - # The default value is '$vardir/run'. - rundir = /var/run/puppet - - # Where SSL certificates are kept. - # The default value is '$confdir/ssl'. - ssldir = $vardir/ssl - manifest = $manifestdir/site.pp - manifestdir = /var/lib/puppet/environments/pub/$environment/manifests - environment = {{ oo_env_long }} - modulepath = /var/lib/puppet/environments/pub/$environment/modules:/var/lib/puppet/environments/pri/$environment/modules:/var/lib/puppet/environments/pri/production/modules:$confdir/modules:/usr/share/puppet/modules - -[agent] - # The file in which puppetd stores a list of the classes - # associated with the retrieved configuratiion. Can be loaded in - # the separate ``puppet`` executable using the ``--loadclasses`` - # option. - # The default value is '$confdir/classes.txt'. - classfile = $vardir/classes.txt - - # Where puppetd caches the local configuration. An - # extension indicating the cache format is added automatically. - # The default value is '$confdir/localconfig'. - localconfig = $vardir/localconfig - server = puppet.ops.rhcloud.com - environment = {{ oo_env_long }} - pluginsync = true - graph = true - configtimeout = 600 - report = true - runinterval = 3600 - splay = true |