diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-03-03 10:06:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 10:06:06 +0100 |
| commit | 8edbc7a5409a578ad9c47111aef3e95fba964239 (patch) | |
| tree | f2978bebab3313bc85cdad3663e4b63dd0eeecf1 /recipes-test/demo-network-config | |
| parent | 98db3460285d634073830879825825c4a893863c (diff) | |
| parent | c771a9e62df91afeed3eae5b1c067ae2525b5a91 (diff) | |
| download | meta-updater-8edbc7a5409a578ad9c47111aef3e95fba964239.tar.gz | |
Merge pull request #692 from advancedtelematic/feat/warrior/2020.3
Feat/warrior/2020.3
Diffstat (limited to 'recipes-test/demo-network-config')
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-test/demo-network-config/files/25-dhcp-server.network b/recipes-test/demo-network-config/files/25-dhcp-server.network index 4766f9a..03bb302 100644 --- a/recipes-test/demo-network-config/files/25-dhcp-server.network +++ b/recipes-test/demo-network-config/files/25-dhcp-server.network | |||
| @@ -4,9 +4,9 @@ Name=enp0s4 | |||
| 4 | [Network] | 4 | [Network] |
| 5 | Description=Private internal network between aktualizr Primary and Secondary nodes | 5 | Description=Private internal network between aktualizr Primary and Secondary nodes |
| 6 | DHCPServer=yes | 6 | DHCPServer=yes |
| 7 | Address=10.0.3.1/24 | 7 | Address=192.168.254.1/24 |
| 8 | IPForward=yes | 8 | IPForward=yes |
| 9 | IPMasquerade=yes | 9 | IPMasquerade=yes |
| 10 | 10 | ||
| 11 | [DHCPServer] | 11 | [DHCPServer] |
| 12 | PoolOffset=10 \ No newline at end of file | 12 | PoolOffset=10 |
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb index 544a5ec..7ee873f 100644 --- a/recipes-test/demo-network-config/primary-network-config.bb +++ b/recipes-test/demo-network-config/primary-network-config.bb | |||
| @@ -15,7 +15,7 @@ do_install() { | |||
| 15 | install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/ | 15 | install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/ |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | PRIMARY_IP ?= "10.0.3.1" | 18 | PRIMARY_IP ?= "192.168.254.1" |
| 19 | 19 | ||
| 20 | IP_ADDR = "${PRIMARY_IP}" | 20 | IP_ADDR = "${PRIMARY_IP}" |
| 21 | CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}" | 21 | CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}" |
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb index ca83d53..b268cd3 100644 --- a/recipes-test/demo-network-config/secondary-network-config.bb +++ b/recipes-test/demo-network-config/secondary-network-config.bb | |||
| @@ -19,9 +19,9 @@ do_install() { | |||
| 19 | install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/ | 19 | install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}${libdir}/systemd/network/ |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | SECONDARY_IP ?= "10.0.3.2" | 22 | SECONDARY_IP ?= "192.168.254.2" |
| 23 | IP_ADDR = "${SECONDARY_IP}" | 23 | IP_ADDR = "${SECONDARY_IP}" |
| 24 | CONF_TYPE = "static" | 24 | CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}" |
| 25 | 25 | ||
| 26 | require network-config.inc | 26 | require network-config.inc |
| 27 | 27 | ||