Skip to content

Commit

Permalink
Adjust provisioner cidr for osx monterey vbox users
Browse files Browse the repository at this point in the history
Change netmask from 192.168.50.0/24 to 192.168.56.0/24

Fixed #228

Signed-off-by: Christopher Ryan <cryan@llnw.com>
  • Loading branch information
Christopher Ryan authored and mmlb committed Dec 10, 2021
1 parent 1e0157f commit 5968f41
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ BOOTS_SERVER_IMAGE="quay.io/tinkerbell/boots:sha-36f12f81"
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
4 changes: 2 additions & 2 deletions deploy/compose/manifests/hardware/hardware-equinix-metal.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions deploy/compose/manifests/hardware/hardware-libvirt.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion deploy/compose/manifests/hardware/hardware.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dhcp": {
"arch": "x86_64",
"ip": {
"address": "192.168.50.43",
"address": "192.168.56.43",
"netmask": "255.255.255.0"
},
"mac": "08:00:27:9e:f5:3a",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/compose/manifests/template/ubuntu-libvirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/compose/manifests/template/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "install-openssl"
image: cexec:v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion deploy/compose/tls/csr.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"tinkerbell.tinkerbell",
"tinkerbell",
"tink-server",
"192.168.50.4",
"192.168.56.4",
"127.0.0.1",
"localhost"
],
Expand Down
2 changes: 1 addition & 1 deletion deploy/terraform/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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
}

Expand Down
8 changes: 4 additions & 4 deletions deploy/vagrant/Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

PROVISIONER_IP = "192.168.50.4"
MACHINE1_IP = "192.168.50.43"
PROVISIONER_IP = "192.168.56.4"
MACHINE1_IP = "192.168.56.43"

$script = <<-SCRIPT
ip addr add 192.168.50.4/24 dev eth1
ip addr add 192.168.56.4/24 dev eth1
ip link set dev eth1 up
SCRIPT

Expand Down Expand Up @@ -47,7 +47,7 @@ Vagrant.configure("2") do |config|
provisioner.vm.provision "shell", inline: $script
provisioner.vm.network "private_network", ip: PROVISIONER_IP,
libvirt__network_name: "tink_network",
libvirt__host_ip: '192.168.50.1',
libvirt__host_ip: '192.168.56.1',
libvirt__netmask: "255.255.255.0",
libvirt__dhcp_enabled: false,
auto_config: false
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstarts/TERRAFORMEM.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion docs/quickstarts/VAGRANTLVIRT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion docs/quickstarts/VAGRANTVBOX.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

0 comments on commit 5968f41

Please sign in to comment.