X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fj2%2Fserverrc.j2;h=d20c2ab2d37635e5b1fbf3d9f2170f2990018270;hb=0a2885e1506c60df0e39d1681657661bacd39670;hp=0f187cc9f199b1eff52abd6fcd1bbfa0003197a0;hpb=88f7b48807627a088499e4d98784405343c98c16;p=yaml_builds.git diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2 index 0f187cc..d20c2ab 100644 --- a/tools/j2/serverrc.j2 +++ b/tools/j2/serverrc.j2 @@ -71,8 +71,8 @@ SRV_CALICO_IP={{yaml.genesis.ksn}} SRV_NEUTRON_IP={{yaml.genesis.neutron}} SRV_PXE_IP={{yaml.genesis.pxe}} SRV_VXLAN_IP={{yaml.genesis.vxlan}} -SRV_SUBNET={{yaml.networks.host.subnet}} -SRV_NETMASK={{yaml.networks.host.netmask}} +SRV_SUBNET={{yaml.networks.host.cidr | cidr_subnet}} +SRV_NETMASK={{yaml.networks.host.cidr | cidr_netmask}} SRV_GATEWAY={{yaml.networks.host.routes.gateway}} SRV_DNS="{% if 'dns' in yaml.networks.host %}{{yaml.networks.host.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}" SRV_DOMAIN={% if 'dns' in yaml.networks.pxe and 'domain' in yaml.networks.pxe.dns %}{{yaml.networks.pxe.dns.domain}}