Stop managing puppet config in puppet

This is completely superceded by ansible at this point.

Change-Id: Ib0e08d9a5104213671af5106d88ffc9b38eb47a9
This commit is contained in:
James E. Blair 2016-09-16 10:04:22 -07:00
parent a01bec1fc6
commit d24d96ab4b
4 changed files with 0 additions and 99 deletions

View File

@ -1,29 +0,0 @@
---
:hierarchy:
# Use private hieradata first
- "hieradata/%{::environment}/fqdn/%{::fqdn}"
- "hieradata/%{::environment}/group/%{group}" # no :: because group is set at nodescope
- "hieradata/%{::environment}/common"
# Use public hieradata second, also be environmentally aware
- "%{::environment}/hiera/fqdn/%{::fqdn}"
- "%{::environment}/hiera/group/%{group}" # no :: because group is set at nodescope
- "%{::environment}/hiera/common"
:backends:
- yaml
:yaml:
:datadir: "/opt/system-config/"
# File directory structure:
# Secret data:
# /opt/system-config/hieradata/
# /opt/system-config/hieradata/production
# /opt/system-config/hieradata/production/fqdn/afs01.openstack.org.yaml #highest priority
# /opt/system-config/hieradata/production/group/afs.yaml #middle priority
# /opt/system-config/hieradata/production/common.yaml #lowest priority
# Public data
# /opt/system-config/production
# /opt/system-config/production/hiera/fqdn/afs01.openstack.org.yaml #highest priority
# /opt/system-config/production/hiera/group/afs.yaml #middle priority
# /opt/system-config/production/hiera/common.yaml #lowest priority

View File

@ -1,2 +0,0 @@
manifest = /opt/system-config/production/manifests/site.pp
modulepath = $basemodulepath:modules:/opt/system-config/production/modules

View File

@ -452,48 +452,12 @@ class openstack_project::template (
}
$puppet_version = $pin_puppet
file { '/etc/puppet/puppet.conf':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => template('openstack_project/puppet.conf.erb'),
replace => true,
}
service { 'puppet':
ensure => stopped,
enable => false,
}
file { '/etc/puppet/hiera.yaml':
ensure => present,
owner => 'root',
group => 'root',
mode => '0555',
source => 'puppet:///modules/openstack_project/puppet/hiera.yaml',
replace => true,
}
file {'/etc/puppet/environments':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
file {'/etc/puppet/environments/production':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
file {'/etc/puppet/environments/production/environment.conf':
ensure => file,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/openstack_project/puppet/production_environment.conf',
}
###########################################################
}

View File

@ -1,32 +0,0 @@
[main]
logdir=/var/log/puppet
vardir=/var/lib/puppet
ssldir=/var/lib/puppet/ssl
rundir=/var/run/puppet
basemodulepath=/etc/puppet/modules
environmentpath = /etc/puppet/environments
data_binding_terminus = none
hiera_config = /etc/puppet/hiera.yaml
[master]
# These are needed when the puppetmaster is run by passenger
# and can safely be removed if webrick is used.
ssl_client_header = SSL_CLIENT_S_DN
ssl_client_verify_header = SSL_CLIENT_VERIFY
reports=store,puppetdb
environmenttimeout = 0
<% if @ca_server -%>
ca = false
ca_server = <%= @ca_server %>
<% end -%>
[agent]
report=true
splay=true
runinterval=600
server=<%= @puppetmaster_server %>
certname=<%= @certname.downcase %>
pluginsync=true
[user]
reports=puppetdb_file