diff --git a/data/hostname/cassandra01.internal.softwareheritage.org.yaml b/data/hostname/cassandra01.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra01.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/cassandra02.internal.softwareheritage.org.yaml b/data/hostname/cassandra02.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra02.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/cassandra03.internal.softwareheritage.org.yaml b/data/hostname/cassandra03.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra03.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/cassandra04.internal.softwareheritage.org.yaml b/data/hostname/cassandra04.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra04.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/cassandra05.internal.softwareheritage.org.yaml b/data/hostname/cassandra05.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra05.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/cassandra06.internal.softwareheritage.org.yaml b/data/hostname/cassandra06.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/cassandra06.internal.softwareheritage.org.yaml @@ -0,0 +1,6 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false + +swh::apt_config::enable_non_free: true +packages: + - zfs-dkms diff --git a/data/hostname/rancher-node-cassandra1.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-cassandra1.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/rancher-node-cassandra1.internal.softwareheritage.org.yaml @@ -0,0 +1,2 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false diff --git a/data/hostname/rancher-node-cassandra2.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-cassandra2.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/rancher-node-cassandra2.internal.softwareheritage.org.yaml @@ -0,0 +1,2 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false diff --git a/data/hostname/rancher-node-cassandra3.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-cassandra3.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/rancher-node-cassandra3.internal.softwareheritage.org.yaml @@ -0,0 +1,2 @@ +# local cache is not compatible with rancher in docker +dns::local_cache: false diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -179,6 +179,18 @@ host: jenkins1-debian.internal.softwareheritage.org 10.168.100.170: host: pompidou.internal.softwareheritage.org + 10.168.100.181: + host: cassandra01.internal.softwareheritage.org + 10.168.100.182: + host: cassandra02.internal.softwareheritage.org + 10.168.100.183: + host: cassandra03.internal.softwareheritage.org + 10.168.100.184: + host: cassandra04.internal.softwareheritage.org + 10.168.100.185: + host: cassandra05.internal.softwareheritage.org + 10.168.100.186: + host: cassandra06.internal.softwareheritage.org 10.168.100.210: host: belvedere.internal.softwareheritage.org aliases: diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -62,7 +62,7 @@ include role::swh_kafka_broker } -node /^cassandra\d+\./ { +node /^cassandra\d?\d+\./ { include role::swh_cassandra_node } diff --git a/site-modules/role/manifests/swh_cassandra_node.pp b/site-modules/role/manifests/swh_cassandra_node.pp --- a/site-modules/role/manifests/swh_cassandra_node.pp +++ b/site-modules/role/manifests/swh_cassandra_node.pp @@ -1,4 +1,5 @@ # Deployment of a cassandra node class role::swh_cassandra_node inherits role::swh_base { - include profile::cassandra::node + # include profile::cassandra::node + include profile::docker }