diff --git a/examples/etcd-large/cloud/etcd1.yaml b/examples/etcd-large/cloud/etcd1.yaml index d3ff4078..d70a574a 100644 --- a/examples/etcd-large/cloud/etcd1.yaml +++ b/examples/etcd-large/cloud/etcd1.yaml @@ -13,19 +13,3 @@ coreos: command: start - name: fleet.service command: start - - name: 00-ens3.network - runtime: true - content: | - [Match] - Name=ens3 - [Network] - Address=172.17.0.21/16 - - name: down-interfaces.service - command: start - content: | - [Service] - Type=oneshot - ExecStart=/usr/bin/ip link set ens3 down - ExecStart=/usr/bin/ip addr flush dev ens3 - - name: systemd-networkd.service - command: restart diff --git a/examples/etcd-large/cloud/etcd2.yaml b/examples/etcd-large/cloud/etcd2.yaml index 0c4d5ff6..9585e537 100644 --- a/examples/etcd-large/cloud/etcd2.yaml +++ b/examples/etcd-large/cloud/etcd2.yaml @@ -13,19 +13,3 @@ coreos: command: start - name: fleet.service command: start - - name: 00-ens3.network - runtime: true - content: | - [Match] - Name=ens3 - [Network] - Address=172.17.0.22/16 - - name: down-interfaces.service - command: start - content: | - [Service] - Type=oneshot - ExecStart=/usr/bin/ip link set ens3 down - ExecStart=/usr/bin/ip addr flush dev ens3 - - name: systemd-networkd.service - command: restart diff --git a/examples/etcd-large/cloud/etcd3.yaml b/examples/etcd-large/cloud/etcd3.yaml index f8459e36..bc564c7e 100644 --- a/examples/etcd-large/cloud/etcd3.yaml +++ b/examples/etcd-large/cloud/etcd3.yaml @@ -13,19 +13,3 @@ coreos: command: start - name: fleet.service command: start - - name: 00-ens3.network - runtime: true - content: | - [Match] - Name=ens3 - [Network] - Address=172.17.0.23/16 - - name: down-interfaces.service - command: start - content: | - [Service] - Type=oneshot - ExecStart=/usr/bin/ip link set ens3 down - ExecStart=/usr/bin/ip addr flush dev ens3 - - name: systemd-networkd.service - command: restart diff --git a/examples/etcd-large/ignition/etcd1.json b/examples/etcd-large/ignition/etcd1.json new file mode 100644 index 00000000..db62791f --- /dev/null +++ b/examples/etcd-large/ignition/etcd1.json @@ -0,0 +1,11 @@ +{ + "ignitionVersion": 1, + "networkd": { + "units": [ + { + "name": "00-ens3.network", + "contents": "[Match]\nName=ens3\n\n[Network]\nDNS=8.8.8.8\nGateway=172.17.0.1\nAddress=172.17.0.21" + } + ] + } +} \ No newline at end of file diff --git a/examples/etcd-large/ignition/etcd2.json b/examples/etcd-large/ignition/etcd2.json new file mode 100644 index 00000000..c08e2a3d --- /dev/null +++ b/examples/etcd-large/ignition/etcd2.json @@ -0,0 +1,11 @@ +{ + "ignitionVersion": 1, + "networkd": { + "units": [ + { + "name": "00-ens3.network", + "contents": "[Match]\nName=ens3\n\n[Network]\nDNS=8.8.8.8\nGateway=172.17.0.1\nAddress=172.17.0.22" + } + ] + } +} \ No newline at end of file diff --git a/examples/etcd-large/ignition/etcd3.json b/examples/etcd-large/ignition/etcd3.json new file mode 100644 index 00000000..d4c23e94 --- /dev/null +++ b/examples/etcd-large/ignition/etcd3.json @@ -0,0 +1,11 @@ +{ + "ignitionVersion": 1, + "networkd": { + "units": [ + { + "name": "00-ens3.network", + "contents": "[Match]\nName=ens3\n\n[Network]\nDNS=8.8.8.8\nGateway=172.17.0.1\nAddress=172.17.0.23" + } + ] + } +} \ No newline at end of file diff --git a/examples/etcd-large/specs/etcd1/spec.json b/examples/etcd-large/specs/etcd1/spec.json index 7c28a3a2..b0753384 100644 --- a/examples/etcd-large/specs/etcd1/spec.json +++ b/examples/etcd-large/specs/etcd1/spec.json @@ -5,9 +5,11 @@ "initrd": ["/assets/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}", - "coreos.autologin": "" + "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}", + "coreos.autologin": "", + "coreos.first_boot": "" } }, "cloud_id": "etcd1.yaml", - "ignition_id": "" + "ignition_id": "etcd1.json" } \ No newline at end of file diff --git a/examples/etcd-large/specs/etcd2/spec.json b/examples/etcd-large/specs/etcd2/spec.json index d554c74d..d4ea6842 100644 --- a/examples/etcd-large/specs/etcd2/spec.json +++ b/examples/etcd-large/specs/etcd2/spec.json @@ -5,9 +5,11 @@ "initrd": ["/assets/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}", - "coreos.autologin": "" + "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}", + "coreos.autologin": "", + "coreos.first_boot": "" } }, "cloud_id": "etcd2.yaml", - "ignition_id": "" + "ignition_id": "etcd2.json" } \ No newline at end of file diff --git a/examples/etcd-large/specs/etcd3/spec.json b/examples/etcd-large/specs/etcd3/spec.json index 9296705b..2734896a 100644 --- a/examples/etcd-large/specs/etcd3/spec.json +++ b/examples/etcd-large/specs/etcd3/spec.json @@ -5,9 +5,11 @@ "initrd": ["/assets/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}", - "coreos.autologin": "" + "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}", + "coreos.autologin": "", + "coreos.first_boot": "" } }, "cloud_id": "etcd3.yaml", - "ignition_id": "" + "ignition_id": "etcd3.json" } \ No newline at end of file diff --git a/examples/etcd-small/cloud/etcd.yaml b/examples/etcd-small/cloud/etcd.yaml index f70d7af7..34450180 100644 --- a/examples/etcd-small/cloud/etcd.yaml +++ b/examples/etcd-small/cloud/etcd.yaml @@ -10,19 +10,3 @@ coreos: units: - name: etcd2.service command: start - - name: 00-ens3.network - runtime: true - content: | - [Match] - Name=ens3 - [Network] - Address=172.17.0.21/16 - - name: down-interfaces.service - command: start - content: | - [Service] - Type=oneshot - ExecStart=/usr/bin/ip link set ens3 down - ExecStart=/usr/bin/ip addr flush dev ens3 - - name: systemd-networkd.service - command: restart diff --git a/examples/etcd-small/ignition/etcd.json b/examples/etcd-small/ignition/etcd.json new file mode 100644 index 00000000..db62791f --- /dev/null +++ b/examples/etcd-small/ignition/etcd.json @@ -0,0 +1,11 @@ +{ + "ignitionVersion": 1, + "networkd": { + "units": [ + { + "name": "00-ens3.network", + "contents": "[Match]\nName=ens3\n\n[Network]\nDNS=8.8.8.8\nGateway=172.17.0.1\nAddress=172.17.0.21" + } + ] + } +} \ No newline at end of file diff --git a/examples/etcd-small/specs/etcd/spec.json b/examples/etcd-small/specs/etcd/spec.json index b859e5ca..918642e9 100644 --- a/examples/etcd-small/specs/etcd/spec.json +++ b/examples/etcd-small/specs/etcd/spec.json @@ -5,9 +5,11 @@ "initrd": ["/assets/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}", - "coreos.autologin": "" + "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}", + "coreos.autologin": "", + "coreos.first_boot": "" } }, "cloud_id": "etcd.yaml", - "ignition_id": "" + "ignition_id": "etcd.json" } \ No newline at end of file