X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fj2%2Fserverrc.j2;fp=tools%2Fj2%2Fserverrc.j2;h=0356fd396bb72d5ce34285353714fb5dbf24b90c;hb=e8e37f6abc18e3c7c5ccbcfd1e2b11926cb69d74;hp=d20c2ab2d37635e5b1fbf3d9f2170f2990018270;hpb=fe885c06b13b6807209a76d0226a40d84ec61df3;p=yaml_builds.git diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2 index d20c2ab..0356fd3 100644 --- a/tools/j2/serverrc.j2 +++ b/tools/j2/serverrc.j2 @@ -54,6 +54,7 @@ SRV_HTTP_BOOT_DEV={% if 'http_boot_device' in yaml.genesis %}{{yaml.genesis.http # tempalte to run to configure OS after first boot # current options are: firstboot.sh.template, firstboot-genesis.sh.tempate or firstboot-airship-iab.sh.template SRV_FIRSTBOOT_TEMPLATE=firstboot-genesis.sh.template +SRV_KERNEL_PARAMS="{% if 'platform' in yaml %}{% for key, value in yaml.platform.kernel_params.items() %}{{key}}={{value}}{{ ' ' if not loop.last else '' }}{% endfor %}{% endif %}" # VLAN to use during build and for final network configuration SRV_VLAN={{yaml.networks.host.vlan}} @@ -61,7 +62,7 @@ SRV_STORAGE_VLAN={{yaml.networks.storage.vlan}} SRV_CALICO_VLAN={{yaml.networks.ksn.vlan}} SRV_NEUTRON_VLAN={{yaml.networks.neutron.vlan}} SRV_PXE_INF={{yaml.networks.pxe.interface}} -SRV_VXLAN_INF={{yaml.networks.vxlan.interface}} +SRV_VXLAN_INF={% if 'vxlan' in yaml.networks %}{{yaml.networks.vxlan.interface}}{% endif %} # basic network information for dhcp config and final server network settings SRV_MTU=9000 @@ -70,7 +71,8 @@ SRV_STORAGE_IP={{yaml.genesis.storage}} 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_VXLAN_IP={% if 'vxlan' in yaml.networks %}{{yaml.genesis.vxlan}}{% endif %} + SRV_SUBNET={{yaml.networks.host.cidr | cidr_subnet}} SRV_NETMASK={{yaml.networks.host.cidr | cidr_netmask}} SRV_GATEWAY={{yaml.networks.host.routes.gateway}} @@ -91,4 +93,3 @@ SRV_BOND={{yaml.networks.primary}} {% for slave in yaml.networks.slaves %} SRV_SLAVE{{loop.index}}={{slave.name}} {% endfor %} -