From 22d021c04a4883569a1731fb0a17e6396d84e95c Mon Sep 17 00:00:00 2001 From: David Loup Date: Wed, 5 Dec 2018 16:43:57 +0100 Subject: [PATCH] [nantes] Add nat.nantes --- .../sites/grenoble/clusters/yeti/nodes/yeti-1.json | 12 ++++++------ .../sites/grenoble/clusters/yeti/nodes/yeti-2.json | 12 ++++++------ .../sites/grenoble/clusters/yeti/nodes/yeti-3.json | 12 ++++++------ .../sites/grenoble/clusters/yeti/nodes/yeti-4.json | 12 ++++++------ data/grid5000/sites/nantes/servers/nat.json | 13 +++++++++++++ input/grid5000/sites/nantes/servers/virtual.yaml | 4 ++++ 6 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 data/grid5000/sites/nantes/servers/nat.json diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json index 3af8e354f8..9d3b6a1bb7 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json @@ -226,9 +226,9 @@ "vendor": "SEAGATE" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb3", - "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", - "device": "nvme0n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bad", + "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", + "device": "nvme1n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", @@ -236,9 +236,9 @@ "storage": "SSD" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bad", - "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", - "device": "nvme1n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb3", + "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", + "device": "nvme0n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json index 1f28c33ace..f01c87edd1 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json @@ -226,9 +226,9 @@ "vendor": "SEAGATE" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389571001020", - "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", - "device": "nvme0n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389671000baf", + "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", + "device": "nvme1n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", @@ -236,9 +236,9 @@ "storage": "SSD" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389671000baf", - "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", - "device": "nvme1n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389571001020", + "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", + "device": "nvme0n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json index 81a3d046cc..b6351a773b 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json @@ -226,9 +226,9 @@ "vendor": "SEAGATE" }, { - "by_id": "/dev/disk/by-id/nvme-eui.002538957100101f", - "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", - "device": "nvme0n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb6", + "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", + "device": "nvme1n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", @@ -236,9 +236,9 @@ "storage": "SSD" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb6", - "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", - "device": "nvme1n1", + "by_id": "/dev/disk/by-id/nvme-eui.002538957100101f", + "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", + "device": "nvme0n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json index bf2cd92024..83fe4636a4 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json @@ -226,9 +226,9 @@ "vendor": "SEAGATE" }, { - "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb5", - "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", - "device": "nvme0n1", + "by_id": "/dev/disk/by-id/nvme-eui.002538957100101b", + "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", + "device": "nvme1n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", @@ -236,9 +236,9 @@ "storage": "SSD" }, { - "by_id": "/dev/disk/by-id/nvme-eui.002538957100101b", - "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1", - "device": "nvme1n1", + "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb5", + "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1", + "device": "nvme0n1", "driver": "nvme", "interface": "NVME", "model": "Dell Express Flash NVMe PM1725 1.6TB AIC", diff --git a/data/grid5000/sites/nantes/servers/nat.json b/data/grid5000/sites/nantes/servers/nat.json new file mode 100644 index 0000000000..afce9e56d3 --- /dev/null +++ b/data/grid5000/sites/nantes/servers/nat.json @@ -0,0 +1,13 @@ +{ + "alias": [ + "access" + ], + "kind": "virtual", + "network_adapters": { + "default": { + "ip": "172.16.207.200" + } + }, + "type": "server", + "uid": "nat" +} \ No newline at end of file diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml index 2828f34c74..86aaf2fd76 100644 --- a/input/grid5000/sites/nantes/servers/virtual.yaml +++ b/input/grid5000/sites/nantes/servers/virtual.yaml @@ -169,3 +169,7 @@ www-dev: api-server-v4: kind: virtual network_adapters: {default: {ip: 172.16.207.130}} +nat: + kind: virtual + alias: [access] + network_adapters: {default: {ip: 172.16.207.200}} -- GitLab