From 4b11912d2dc915d642d82e6da0c94e185ec66c99 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 10 Sep 2017 23:33:36 +0200 Subject: reclass, states: Parametrize runtime configuration mcpcontrol virsh network, as well as MaaS PXE network are installer specific, and not POD specific. Therefore, these should be easily parametrized without the PDF, using only installer inputs (e.g. env vars passed via Jenkins). - add new reclass class; - parametrize at runtime new reclass class based on global vars; - factor out MaaS deploy address / config using new mechanism; - parametrize at runtime virsh network definitions based on template; - add new "maas.pxe_route" sls for configuring routing on cfg01; - replace env vars with the new sls in "maas" state; NOTE: baremetal parametrization will be handled later. Change-Id: Ifd61143d818fb088b3f4395388ba769bbc49156e Signed-off-by: Alexandru Avadanii --- mcp/config/states/maas | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mcp/config/states/maas') diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 67a7c213a..0d733bafa 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -56,8 +56,7 @@ salt -C 'mas01*' state.apply linux,salt,openssh,ntp salt -C 'mas01*' state.apply linux.network.interface salt -C 'mas01*' state.apply maas.pxe_nat salt -C 'mas01*' state.apply maas.cluster -salt -C 'cfg01*' cmd.run \ - "route add -net 192.168.11.0/24 gw ${MAAS_IP:-10.20.0.3}" +salt -C 'cfg01*' state.apply maas.pxe_route wait_for 10 "salt -C 'mas01*' state.apply maas.region" -- cgit 1.2.3-korg