Only setup ca_server on main
This commit is contained in:
parent
eb5c5c4cff
commit
849831668d
|
@ -24,7 +24,6 @@ class puppet (
|
||||||
$certname = $::fqdn,
|
$certname = $::fqdn,
|
||||||
$puppetmaster_server = 'puppetmaster.openstack.org',
|
$puppetmaster_server = 'puppetmaster.openstack.org',
|
||||||
$puppet_ca_server = undef,
|
$puppet_ca_server = undef,
|
||||||
$ca_server = undef,
|
|
||||||
$dns_alt_names = undef,
|
$dns_alt_names = undef,
|
||||||
$environment_path = '/etc/puppet/environments',
|
$environment_path = '/etc/puppet/environments',
|
||||||
$basemodule_path = '/etc/puppet/modules',
|
$basemodule_path = '/etc/puppet/modules',
|
||||||
|
|
|
@ -33,10 +33,6 @@ reports=<%= @reports %>
|
||||||
storeconfigs = <%= @store_configs %>
|
storeconfigs = <%= @store_configs %>
|
||||||
storeconfigs_backend = <%= @store_backend %>
|
storeconfigs_backend = <%= @store_backend %>
|
||||||
basemodulepath = <%= @basemodule_path %>
|
basemodulepath = <%= @basemodule_path %>
|
||||||
<% if @ca_server -%>
|
|
||||||
ca=false
|
|
||||||
ca_server = <%= @ca_server %>
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
[agent]
|
[agent]
|
||||||
report=true
|
report=true
|
||||||
|
|
Loading…
Reference in New Issue