diff --git a/manifests/init.pp b/manifests/init.pp
index 15a4488..6718b9c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,7 +24,6 @@ class puppet (
   $certname              = $::fqdn,
   $puppetmaster_server   = 'puppetmaster.openstack.org',
   $puppet_ca_server      = undef,
-  $ca_server             = undef,
   $dns_alt_names         = undef,
   $environment_path      = '/etc/puppet/environments',
   $basemodule_path       = '/etc/puppet/modules',
diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 403c84e..dbb807a 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -33,10 +33,6 @@ reports=<%= @reports %>
 storeconfigs = <%= @store_configs %>
 storeconfigs_backend = <%= @store_backend %>
 basemodulepath = <%= @basemodule_path %>
-<% if @ca_server -%>
-ca=false
-ca_server = <%= @ca_server %>
-<% end -%>
 
 [agent]
 report=true