From 33dbf2f3480be2979166cc9cc41ec70c1c4dc151 Mon Sep 17 00:00:00 2001 From: Christopher Ryan Date: Thu, 2 Dec 2021 23:55:01 -0700 Subject: [PATCH] Change netmask from 192.168.50.0/24 to 192.168.56.0/24 Signed-off-by: Christopher Ryan --- README.md | 2 +- deploy/compose/.env | 4 ++-- deploy/compose/manifests/hardware/hardware-equinix-metal.json | 4 ++-- deploy/compose/manifests/hardware/hardware-libvirt.json | 4 ++-- deploy/compose/manifests/template/ubuntu-equinix-metal.yaml | 2 +- deploy/compose/manifests/template/ubuntu-libvirt.yaml | 2 +- deploy/compose/tls/csr.json | 3 +-- deploy/terraform/setup.sh | 2 +- docs/quickstarts/TERRAFORMEM.md | 2 +- docs/quickstarts/VAGRANTLVIRT.md | 2 +- docs/quickstarts/VAGRANTVBOX.md | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index b5e45d8b..f536ed73 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The following docs will help you get started. 2. Upload any container images you want to use in the templates to the internal registry ```bash - docker run -it --rm quay.io/containers/skopeo copy --all --dest-tls-verify=false --dest-creds="admin":"Admin1234" docker://hello-world docker://192.168.50.4/hello-world + docker run -it --rm quay.io/containers/skopeo copy --all --dest-tls-verify=false --dest-creds="admin":"Admin1234" docker://hello-world docker://192.168.56.4/hello-world ``` 3. Create a workflow diff --git a/deploy/compose/.env b/deploy/compose/.env index b618c012..8cfa3769 100644 --- a/deploy/compose/.env +++ b/deploy/compose/.env @@ -7,6 +7,6 @@ BOOTS_SERVER_IMAGE="quay.io/mmlb/boots:no-dir-in-ipxe-bin-names" HEGEL_SERVER_IMAGE="quay.io/tinkerbell/hegel:sha-89cb9dc8" TINKERBELL_HARDWARE_MANIFEST="/manifests/hardware/hardware.json" TINKERBELL_TEMPLATE_MANIFEST="/manifests/template/ubuntu.yaml" -TINKERBELL_HOST_IP=192.168.50.4 -TINKERBELL_CLIENT_IP=192.168.50.43 +TINKERBELL_HOST_IP=192.168.56.4 +TINKERBELL_CLIENT_IP=192.168.56.43 TINKERBELL_CLIENT_MAC=08:00:27:9e:f5:3a diff --git a/deploy/compose/manifests/hardware/hardware-equinix-metal.json b/deploy/compose/manifests/hardware/hardware-equinix-metal.json index 8c9315db..b9dcd634 100644 --- a/deploy/compose/manifests/hardware/hardware-equinix-metal.json +++ b/deploy/compose/manifests/hardware/hardware-equinix-metal.json @@ -15,8 +15,8 @@ "dhcp": { "arch": "x86_64", "ip": { - "address": "192.168.50.43", - "gateway": "192.168.50.4", + "address": "192.168.56.43", + "gateway": "192.168.56.4", "netmask": "255.255.255.0" }, "mac": "08:00:27:9e:f5:3a", diff --git a/deploy/compose/manifests/hardware/hardware-libvirt.json b/deploy/compose/manifests/hardware/hardware-libvirt.json index 8efb60b3..39e6c387 100644 --- a/deploy/compose/manifests/hardware/hardware-libvirt.json +++ b/deploy/compose/manifests/hardware/hardware-libvirt.json @@ -15,8 +15,8 @@ "dhcp": { "arch": "x86_64", "ip": { - "address": "192.168.50.43", - "gateway": "192.168.50.1", + "address": "192.168.56.43", + "gateway": "192.168.56.1", "netmask": "255.255.255.0" }, "mac": "08:00:27:9e:f5:3a", diff --git a/deploy/compose/manifests/template/ubuntu-equinix-metal.yaml b/deploy/compose/manifests/template/ubuntu-equinix-metal.yaml index ee747830..e21e871f 100644 --- a/deploy/compose/manifests/template/ubuntu-equinix-metal.yaml +++ b/deploy/compose/manifests/template/ubuntu-equinix-metal.yaml @@ -14,7 +14,7 @@ tasks: timeout: 600 environment: DEST_DISK: /dev/sda - IMG_URL: "http://192.168.50.4:8080/focal-server-cloudimg-amd64.raw.gz" + IMG_URL: "http://192.168.56.4:8080/focal-server-cloudimg-amd64.raw.gz" COMPRESSED: true - name: "grow-partition" image: cexec:v1.0.0 diff --git a/deploy/compose/manifests/template/ubuntu-libvirt.yaml b/deploy/compose/manifests/template/ubuntu-libvirt.yaml index 321074e9..88b29de0 100644 --- a/deploy/compose/manifests/template/ubuntu-libvirt.yaml +++ b/deploy/compose/manifests/template/ubuntu-libvirt.yaml @@ -14,7 +14,7 @@ tasks: timeout: 600 environment: DEST_DISK: /dev/vda - IMG_URL: "http://192.168.50.4:8080/focal-server-cloudimg-amd64.raw.gz" + IMG_URL: "http://192.168.56.4:8080/focal-server-cloudimg-amd64.raw.gz" COMPRESSED: true - name: "install-openssl" image: cexec:v1.0.0 diff --git a/deploy/compose/tls/csr.json b/deploy/compose/tls/csr.json index 68612c66..a445fb15 100644 --- a/deploy/compose/tls/csr.json +++ b/deploy/compose/tls/csr.json @@ -1,12 +1,11 @@ { "CN": "Tinkerbell", "hosts": [ - "192.168.56.4", "tinkerbell.registry", "tinkerbell.tinkerbell", "tinkerbell", "tink-server", - "192.168.50.4", + "192.168.56.4", "127.0.0.1", "localhost" ], diff --git a/deploy/terraform/setup.sh b/deploy/terraform/setup.sh index 35123fcb..19d11fc1 100755 --- a/deploy/terraform/setup.sh +++ b/deploy/terraform/setup.sh @@ -39,7 +39,7 @@ setup_layer2_network() { #local ip_addr="$2" ifenslave -d bond0 "${layer2_interface}" #ip addr add ${ip_addr}/24 dev "${layer2_interface}" - ip addr add 192.168.50.4/24 dev "${layer2_interface}" + ip addr add 192.168.56.4/24 dev "${layer2_interface}" ip link set dev "${layer2_interface}" up } diff --git a/docs/quickstarts/TERRAFORMEM.md b/docs/quickstarts/TERRAFORMEM.md index f39b8c44..ec303ace 100644 --- a/docs/quickstarts/TERRAFORMEM.md +++ b/docs/quickstarts/TERRAFORMEM.md @@ -104,5 +104,5 @@ This option will also show you how to create a machine to provision. ```bash # crtl-c to exit the watch - ssh tink@192.168.50.43 # user/pass => tink/tink + ssh tink@192.168.56.43 # user/pass => tink/tink ``` diff --git a/docs/quickstarts/VAGRANTLVIRT.md b/docs/quickstarts/VAGRANTLVIRT.md index 6ad92a34..3d0d48ab 100644 --- a/docs/quickstarts/VAGRANTLVIRT.md +++ b/docs/quickstarts/VAGRANTLVIRT.md @@ -286,5 +286,5 @@ This option will also show you how to create a machine to provision. ```bash vagrant ssh provisioner - ssh tink@192.168.50.43 # user/pass => tink/tink + ssh tink@192.168.56.43 # user/pass => tink/tink ``` diff --git a/docs/quickstarts/VAGRANTVBOX.md b/docs/quickstarts/VAGRANTVBOX.md index 97899c9c..447945f9 100644 --- a/docs/quickstarts/VAGRANTVBOX.md +++ b/docs/quickstarts/VAGRANTVBOX.md @@ -274,5 +274,5 @@ This option will also show you how to create a machine to provision. ```bash vagrant ssh provisioner - ssh tink@192.168.50.43 # user/pass => tink/tink + ssh tink@192.168.56.43 # user/pass => tink/tink ```