diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-26 21:59:28 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 01:13:01 +0100 |
commit | 058c64ae668191ca8223afa581c7b3214b52fe4a (patch) | |
tree | 8fc6c8f1bb23cf8606d0a2e371979f5b3da23567 /mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 | |
parent | 30d5ba634a5c249697509d7c4f29f4aca0597457 (diff) |
[PDF] Switch to generate_config, unify templates
- move bash template handling (previously expanded via `envsubst`)
to lib.sh;
- move j2 template handling to lib.sh;
- move virsh network templates to 'mcp/scripts/virsh_net' subdir;
- switch virsh network templates from `envsubst` expansion to j2 and
leverage generate_config.py, similar to PDF Fuel installer adapter;
- add relevant runtime env vars (e.g. SALT_MASTER, MAAS_IP) on the fly
to PDF, to consume them in templates like params coming from PDF;
- parameterize virsh network definitions based on PDF (mgmt, public);
JIRA: FUEL-322
Change-Id: Ib94e78fc4f25797b9354a0552e884104da5d0003
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/virsh_net/net_mcpcontrol.xml.j2')
-rw-r--r-- | mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 b/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 new file mode 100644 index 000000000..95424db4e --- /dev/null +++ b/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 @@ -0,0 +1,19 @@ +<!-- + Copyright (c) 2017 Mirantis Inc., Enea AB and others. + + All rights reserved. This program and the accompanying materials + are made available under the terms of the Apache License, Version 2.0 + which accompanies this distribution, and is available at + http://www.apache.org/licenses/LICENSE-2.0 +--> +{#- conf.MCPCONTROL_NET & co are mandatory, defaults are set via globals.sh #} +<network> + <name>mcpcontrol</name> + <bridge name="mcpcontrol"/> + <forward mode="nat"/> + <ip address="{{ conf.MCPCONTROL_NET | ipaddr_index(1) }}" netmask="{{ conf.MCPCONTROL_PREFIX | netmask }}"> + <dhcp> + <range start="{{ conf.MCPCONTROL_NET | ipaddr_index(2) }}" end="{{ conf.MCPCONTROL_NET | ipaddr_index(254) }}"/> + </dhcp> + </ip> +</network> |