diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 3 | ||||
| -rw-r--r-- | mcp/scripts/net_mcpcontrol.xml | 10 | ||||
| -rw-r--r-- | mcp/scripts/net_mcpcontrol.xml.template | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index e123e5231..650c63b16 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -65,7 +65,8 @@ create_networks() { # create required networks, including constant "mcpcontrol" # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure # we delete the old "pxe" virtual network, or it would cause IP conflicts. - for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + # FIXME(alav): The same applies for "fuel1" virsh network. + for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" diff --git a/mcp/scripts/net_mcpcontrol.xml b/mcp/scripts/net_mcpcontrol.xml deleted file mode 100644 index f756ee0ae..000000000 --- a/mcp/scripts/net_mcpcontrol.xml +++ /dev/null @@ -1,10 +0,0 @@ -<network> - <name>mcpcontrol</name> - <bridge name="mcpcontrol"/> - <forward mode="nat"/> - <ip address="192.168.10.1" netmask="255.255.255.0"> - <dhcp> - <range start="192.168.10.100" end="192.168.10.254"/> - </dhcp> - </ip> -</network> diff --git a/mcp/scripts/net_mcpcontrol.xml.template b/mcp/scripts/net_mcpcontrol.xml.template new file mode 100644 index 000000000..722a66aa9 --- /dev/null +++ b/mcp/scripts/net_mcpcontrol.xml.template @@ -0,0 +1,10 @@ +<network> + <name>mcpcontrol</name> + <bridge name="mcpcontrol"/> + <forward mode="nat"/> + <ip address="${MCP_CTRL_NETWORK_ROOTSTR}.1" netmask="255.255.255.0"> + <dhcp> + <range start="${MCP_CTRL_NETWORK_ROOTSTR}.2" end="${MCP_CTRL_NETWORK_ROOTSTR}.254"/> + </dhcp> + </ip> +</network> |