diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -109,8 +109,6 @@ aliases: - nicolas.gattolin@softwareheritage.org -networks: {} - networks::private_routes: vpn: network: 192.168.101.0/24 diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -1,3 +1,4 @@ +--- # forwarder for : # - swh network # - Inria network @@ -19,20 +20,6 @@ smtp::relay_hostname: 'none' -swh::deploy::worker::instances: - - checker_deposit - - lister - - loader_archive - - loader_cran - - loader_debian - - loader_deposit - - loader_git - - loader_mercurial - - loader_nixguix - - loader_npm - - loader_pypi - - loader_svn - dns::forward_zones: { } netbox::vhost::letsencrypt_cert: inventory-vagrant diff --git a/data/vagrant/bojimans.internal.softwareheritage.org.yaml b/data/vagrant/bojimans.internal.softwareheritage.org.yaml deleted file mode 100644 --- a/data/vagrant/bojimans.internal.softwareheritage.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -networks: - eth0: - # vagrant admin interface - type: dhcp diff --git a/data/vagrant/webapp.internal.staging.swh.network.yaml b/data/vagrant/webapp.internal.staging.swh.network.yaml deleted file mode 100644 --- a/data/vagrant/webapp.internal.staging.swh.network.yaml +++ /dev/null @@ -1,4 +0,0 @@ -networks: - eth0: - # vagrant admin interface - type: dhcp diff --git a/data/vagrant/worker0.internal.staging.swh.network.yaml b/data/vagrant/worker0.internal.staging.swh.network.yaml deleted file mode 100644 --- a/data/vagrant/worker0.internal.staging.swh.network.yaml +++ /dev/null @@ -1,4 +0,0 @@ -networks: - eth0: - # vagrant admin interface - type: dhcp diff --git a/data/vagrant/worker01.softwareheritage.org.yaml b/data/vagrant/worker01.softwareheritage.org.yaml deleted file mode 100644 --- a/data/vagrant/worker01.softwareheritage.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -networks: - eth0: - # vagrant admin interface - type: dhcp diff --git a/hiera-vagrant.yaml b/hiera-vagrant.yaml deleted file mode 100644 --- a/hiera-vagrant.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# global hiera configuration -# used only on the vagrant environement ---- -version: 5 -defaults: - datadir: data # datadir by default moved to 'defaults' folder - data_hash: yaml_data # Default backend -hierarchy: - - path: "../environments/%{::environment}/data/vagrant/%{trusted.certname}.yaml" - name: "Vagrant overrides by hostnames" diff --git a/site-modules/role/manifests/swh_base.pp b/site-modules/role/manifests/swh_base.pp --- a/site-modules/role/manifests/swh_base.pp +++ b/site-modules/role/manifests/swh_base.pp @@ -14,7 +14,7 @@ include profile::megacli } - if ! lookup('networks', {default_value => {}}).empty { + if ! lookup('networks', {default_value => {}}).empty and $::subnet != 'vagrant' { include profile::network }