Remove FreeIPA dnmasq

diff --git a/personal_infra/puppet/site/case.ces.int.pdp7.net.pp b/personal_infra/puppet/site/case.ces.int.pdp7.net.pp
index 1b0b9f38f3de68817108de296264a8d44a11bb7f..2b4844cf359404db957c3ab4ea219cc32539f2d3 100644 (file)
--- a/personal_infra/puppet/site/case.ces.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/case.ces.int.pdp7.net.pp
@@ -7,6 +7,4 @@ host-record=tplink,tplink.ces.int.pdp7.net,10.17.19.2
 host-record=case.ces.int.pdp7.net,case,10.17.19.3
 ',
   }
-
-  class {'freeipa::dnsmasq':}
 }

diff --git a/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp b/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp
index caf0d92ef6f36678175ef5930df0624c8f8535f2..0b04c3d558a0abf0f1e60d92927a4bebb06bdd4d 100644 (file)
--- a/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp
@@ -8,5 +8,4 @@ dhcp-option=121,10.0.0.0/8,192.168.76.2
 ",
     notify => Service["dnsmasq"],
   }
-  class {'freeipa::dnsmasq':}
 }

diff --git a/personal_infra/puppet/site/h1.pdp7.net.pp b/personal_infra/puppet/site/h1.pdp7.net.pp
index 1c6ae1cea8f7c2e3457423ee0a8a58cda6e34b90..af66ab546de273d3d6509735a3d94ab2d0deee75 100644 (file)
--- a/personal_infra/puppet/site/h1.pdp7.net.pp
+++ b/personal_infra/puppet/site/h1.pdp7.net.pp
@@ -1,7 +1,6 @@
 node 'h1.pdp7.net' {
   class {'proxmox::freeipa':}
   class {'dns_dhcp':}
-  class {'freeipa::dnsmasq':}
 
   # TODO: ugly; tinc scripts require this :(
   package {'net-tools':}

diff --git a/personal_infra/puppet/site/h2.pdp7.net.pp b/personal_infra/puppet/site/h2.pdp7.net.pp
index 99255f19b4fbe471c152961ca7ab74b03f65622f..51dda7a171286bda2dbba40bf6b5fc210a482c03 100644 (file)
--- a/personal_infra/puppet/site/h2.pdp7.net.pp
+++ b/personal_infra/puppet/site/h2.pdp7.net.pp
@@ -1,10 +1,9 @@
 node 'h2.pdp7.net' {
   class {'dns_dhcp':}
-  class {'freeipa::dnsmasq':}
 
   file {'/etc/dnsmasq.d/static.conf':
     content => "dhcp-host=freeswitch,10.42.42.3,freeswitch
 host-record=h2.h2.int.pdp7.net,10.42.42.1
 ",
-  }    
+  }
 }

diff --git a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
index 106049ecb7b52028d0d9d6ca481e5e8a2a38eba9..064af4d4f03f0ca9dae4d2ea846cee7218c42563 100644 (file)
--- a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
@@ -1,6 +1,5 @@
 node 'maelcum.mad.int.pdp7.net' {
   class {'dns_dhcp':}
-  class {'freeipa::dnsmasq':}
   file {'/etc/dnsmasq.d/static.conf':
     content => 'host-record=router,router.mad.int.pdp7.net,10.34.10.1
 dhcp-host=d8:8c:79:1a:11:59,chromecast,10.34.10.3