Permalink
Browse files

Fix Static settings not being applied.

Thanks for the report @jsimmonds2
  • Loading branch information...
ConnorRigby committed Nov 28, 2018
1 parent e371a76 commit a0d44432fc11b23447e01f5e116b207516c375d8
Showing with 38 additions and 34 deletions.
  1. +33 −33 .circleci/config.yml
  2. +5 −1 platform/target/network/network.ex
@@ -611,39 +611,39 @@ workflows:
- build_rpi_prod_firmware

# This deploys the staging branch to my.farm.bot
deploy_staging_production:
jobs:
- build_rpi3_prod_firmware:
context: farmbot-production
filters:
branches:
only:
- staging

- build_rpi_prod_firmware:
context: farmbot-production
filters:
branches:
only:
- staging

- deploy_rpi3_prod_firmware_staging:
context: farmbot-production
filters:
branches:
only:
- staging
requires:
- build_rpi3_prod_firmware

- deploy_rpi_prod_firmware_staging:
context: farmbot-production
filters:
branches:
only:
- staging
requires:
- build_rpi_prod_firmware
# deploy_staging_production:
# jobs:
# - build_rpi3_prod_firmware:
# context: farmbot-production
# filters:
# branches:
# only:
# - staging

# - build_rpi_prod_firmware:
# context: farmbot-production
# filters:
# branches:
# only:
# - staging

# - deploy_rpi3_prod_firmware_staging:
# context: farmbot-production
# filters:
# branches:
# only:
# - staging
# requires:
# - build_rpi3_prod_firmware

# - deploy_rpi_prod_firmware_staging:
# context: farmbot-production
# filters:
# branches:
# only:
# - staging
# requires:
# - build_rpi_prod_firmware

# This deploys the staging branch to staging.farm.bot
deploy_staging_staging:
@@ -150,7 +150,11 @@ defmodule Farmbot.Target.Network do
defp maybe_use_advanced({name, opts}, config) do
case config.ipv4_method do
"static" ->
settings = [ipv4_method: "static", ipv4_address: config.ipv4_address, ipv4_gateway: config.ipv4_gateway, ipv4_subnet_mask: config.ipv4_subnet_mask]
settings = [
ipv4_address_method: "static",
ipv4_address: config.ipv4_address,
ipv4_gateway: config.ipv4_gateway,
ipv4_subnet_mask: config.ipv4_subnet_mask]
{name, Keyword.merge(opts, settings)}
"dhcp" -> {name, opts}
end

0 comments on commit a0d4443

Please sign in to comment.