From: Tom Hughes Date: Thu, 21 Mar 2019 17:28:25 +0000 (+0000) Subject: Enable netplan for remaining servers X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/74ccc507f7e26531cee96cc31115a4f50a4fed72 Enable netplan for remaining servers --- diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb index b383c450e..7dcafe607 100644 --- a/cookbooks/networking/attributes/default.rb +++ b/cookbooks/networking/attributes/default.rb @@ -9,4 +9,4 @@ default[:networking][:firewall][:mangle] = true default[:networking][:interfaces] = {} default[:networking][:nameservers] = [] default[:networking][:search] = [] -default[:networking][:netplan] = false +default[:networking][:netplan] = true diff --git a/roles/ascalon.rb b/roles/ascalon.rb index e5086064d..1e9a9e4a1 100644 --- a/roles/ascalon.rb +++ b/roles/ascalon.rb @@ -3,7 +3,6 @@ description "Master role applied to ascalon" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eno1", diff --git a/roles/boitata.rb b/roles/boitata.rb index aeccc1e71..d0fcef8d3 100644 --- a/roles/boitata.rb +++ b/roles/boitata.rb @@ -3,7 +3,6 @@ description "Master role applied to boitata" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens3", diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 6e12a87bf..209717f76 100644 --- a/roles/bytemark.rb +++ b/roles/bytemark.rb @@ -5,7 +5,6 @@ default_attributes( :hosted_by => "Bytemark", :location => "York, England", :networking => { - :netplan => true, :nameservers => ["80.68.80.24", "80.68.80.25", "2001:41c8:2::1", "2001:41c8:2::2"], :roles => { :internal => { diff --git a/roles/cherufe.rb b/roles/cherufe.rb index 97de42336..cb523d339 100644 --- a/roles/cherufe.rb +++ b/roles/cherufe.rb @@ -3,7 +3,6 @@ description "Master role applied to cherufe" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens18", diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb index 91bd103dd..a96ab9e20 100644 --- a/roles/chrysophylax.rb +++ b/roles/chrysophylax.rb @@ -3,7 +3,6 @@ description "Master role applied to chrysophylax" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens160", diff --git a/roles/culebre.rb b/roles/culebre.rb index b1938d2b1..954adeb78 100644 --- a/roles/culebre.rb +++ b/roles/culebre.rb @@ -3,7 +3,6 @@ description "Master role applied to culebre" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens3", diff --git a/roles/equinix.rb b/roles/equinix.rb index 8b711a296..85d445dce 100644 --- a/roles/equinix.rb +++ b/roles/equinix.rb @@ -3,7 +3,6 @@ description "Role applied to all servers at Equinix" default_attributes( :networking => { - :netplan => true, :nameservers => ["66.28.0.45", "66.28.0.61", "2001:978:1:1::d", "2001:978:1:2::d"], :roles => { :internal => { diff --git a/roles/fafnir.rb b/roles/fafnir.rb index 060635301..297a610c3 100644 --- a/roles/fafnir.rb +++ b/roles/fafnir.rb @@ -3,7 +3,6 @@ description "Master role applied to fafnir" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "enp3s0f0", diff --git a/roles/jakelong.rb b/roles/jakelong.rb index 9acde915a..94200c338 100644 --- a/roles/jakelong.rb +++ b/roles/jakelong.rb @@ -3,7 +3,6 @@ description "Master role applied to jakelong" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/kalessin.rb b/roles/kalessin.rb index bdf84cb34..93106dd42 100644 --- a/roles/kalessin.rb +++ b/roles/kalessin.rb @@ -3,7 +3,6 @@ description "Master role applied to kalessin" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens3", diff --git a/roles/katie.rb b/roles/katie.rb index 99a694828..47da3aa8f 100644 --- a/roles/katie.rb +++ b/roles/katie.rb @@ -15,7 +15,6 @@ default_attributes( }, :location => "Falkenstein, Germany", :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/keizer.rb b/roles/keizer.rb index df207aac7..4bf691bdc 100644 --- a/roles/keizer.rb +++ b/roles/keizer.rb @@ -4,7 +4,6 @@ description "Master role applied to keizer" default_attributes( :location => "Nuremberg, Germany", :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/kessie.rb b/roles/kessie.rb index 20ebf8445..941e9b2b2 100644 --- a/roles/kessie.rb +++ b/roles/kessie.rb @@ -21,7 +21,6 @@ default_attributes( } }, :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "em1", diff --git a/roles/konqi.rb b/roles/konqi.rb index 10e69e196..6e3ee6834 100644 --- a/roles/konqi.rb +++ b/roles/konqi.rb @@ -3,7 +3,6 @@ description "Master role applied to konqi" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/ladon.rb b/roles/ladon.rb index d64411431..75da422c8 100644 --- a/roles/ladon.rb +++ b/roles/ladon.rb @@ -3,7 +3,6 @@ description "Master role applied to ladon" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "bond0", diff --git a/roles/naga.rb b/roles/naga.rb index 009a3ea7f..00ee1e368 100644 --- a/roles/naga.rb +++ b/roles/naga.rb @@ -3,7 +3,6 @@ description "Master role applied to naga" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens18", diff --git a/roles/necrosan.rb b/roles/necrosan.rb index cfafe7e85..f042dd78e 100644 --- a/roles/necrosan.rb +++ b/roles/necrosan.rb @@ -3,7 +3,6 @@ description "Master role applied to necrosan" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens18", diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index 11c285464..46a199b94 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -3,7 +3,6 @@ description "Master role applied to nepomuk" default_attributes( :networking => { - :netplan => true, :firewall => { :inet => [ { diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb index 67db8cf7d..e17375765 100644 --- a/roles/nidhogg.rb +++ b/roles/nidhogg.rb @@ -3,7 +3,6 @@ description "Master role applied to nidhogg" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens18", diff --git a/roles/noomoahk.rb b/roles/noomoahk.rb index 332db425b..61876296a 100644 --- a/roles/noomoahk.rb +++ b/roles/noomoahk.rb @@ -3,7 +3,6 @@ description "Master role applied to noomoahk" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens3", diff --git a/roles/norbert.rb b/roles/norbert.rb index c998fb12a..d90f8602d 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -3,7 +3,6 @@ description "Master role applied to norbert" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens18", diff --git a/roles/pyrene.rb b/roles/pyrene.rb index 223a37d02..b3bee0f77 100644 --- a/roles/pyrene.rb +++ b/roles/pyrene.rb @@ -14,7 +14,6 @@ default_attributes( } }, :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eno1", diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb index 6d0b126c3..b29de0fa1 100644 --- a/roles/rhaegal.rb +++ b/roles/rhaegal.rb @@ -25,7 +25,6 @@ default_attributes( }, :location => "Zagreb, Croatia", :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "enp1s0f0", diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb index 3232dc3ef..a19f77c07 100644 --- a/roles/ridgeback.rb +++ b/roles/ridgeback.rb @@ -23,7 +23,6 @@ default_attributes( } }, :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb index cf5ff6a2d..1b6b34cfb 100644 --- a/roles/rimfaxe.rb +++ b/roles/rimfaxe.rb @@ -3,7 +3,6 @@ description "Master role applied to rimfaxe" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/saphira.rb b/roles/saphira.rb index 4e32f12ee..dcb011087 100644 --- a/roles/saphira.rb +++ b/roles/saphira.rb @@ -3,7 +3,6 @@ description "Master role applied to saphira" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/scorch.rb b/roles/scorch.rb index 76b4b78e1..07c2932e4 100644 --- a/roles/scorch.rb +++ b/roles/scorch.rb @@ -24,7 +24,6 @@ default_attributes( } }, :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb index 879a68c2e..fc50adc39 100644 --- a/roles/stormfly-01.rb +++ b/roles/stormfly-01.rb @@ -3,7 +3,6 @@ description "Master role applied to stormfly-01" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "em1", diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb index 54f42d5b4..865ba66a0 100644 --- a/roles/stormfly-02.rb +++ b/roles/stormfly-02.rb @@ -3,7 +3,6 @@ description "Master role applied to stormfly-02" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "em1", diff --git a/roles/trogdor.rb b/roles/trogdor.rb index 697baa17c..8119fc03c 100644 --- a/roles/trogdor.rb +++ b/roles/trogdor.rb @@ -3,7 +3,6 @@ description "Master role applied to trogdor" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eth0", diff --git a/roles/tuatara.rb b/roles/tuatara.rb index afad1ab82..a7c24b231 100644 --- a/roles/tuatara.rb +++ b/roles/tuatara.rb @@ -3,7 +3,6 @@ description "Master role applied to tuatara" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "eno1", diff --git a/roles/ucl.rb b/roles/ucl.rb index f0edbfdfe..27064ea23 100644 --- a/roles/ucl.rb +++ b/roles/ucl.rb @@ -4,7 +4,6 @@ description "Role applied to all servers at UCL" default_attributes( :location => "Slough, England", :networking => { - :netplan => true, :roles => { :internal => { :inet => { diff --git a/roles/waima.rb b/roles/waima.rb index 405e255c1..32321cc90 100644 --- a/roles/waima.rb +++ b/roles/waima.rb @@ -3,7 +3,6 @@ description "Master role applied to waima" default_attributes( :networking => { - :netplan => true, :interfaces => { :external_ipv4 => { :interface => "ens3",