diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 03:28:45 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 06:03:27 +0100 |
| commit | 5f95f52021fa08de3a0a46bdd98b0b711fec1ecc (patch) | |
| tree | 07dbefc97bef40cf8867059290f63f5a69d8f813 /mcp/reclass | |
| parent | 058c64ae668191ca8223afa581c7b3214b52fe4a (diff) | |
[FN VM] Reboot VMs on jump, wait for all online
- apply `linux` state on cfg01 first, so PXE/admin IP is added and
FN VM minions are available;
- add barrier and wait for all FN VMs to register with cfg01;
- use batch-mode execution while applying `linux.network` on FN VMs;
- retry all states executed via <salt.sh> on FN VMs;
JIRA: FUEL-310
Change-Id: I72e1c565370072500df1d486fe76e6315f583c75
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 12 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml index 7e3a49491..908ba7719 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml @@ -33,6 +33,11 @@ parameters: linux: network: interface: + dhcp: + enabled: true + type: eth + proto: dhcp + name: ${_param:opnfv_fn_vm_primary_interface} single_int: enabled: true name: ${_param:opnfv_fn_vm_secondary_interface} @@ -40,6 +45,13 @@ parameters: proto: static address: ${_param:single_address} netmask: 255.255.255.0 + pxe: + enabled: true + type: eth + proto: static + name: ${_param:opnfv_fn_vm_tertiary_interface} + address: ${_param:opnfv_infra_config_pxe_address} + netmask: 255.255.255.0 salt: master: file_recv: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml index 98256745f..9defb0070 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml @@ -54,6 +54,11 @@ parameters: version: latest network: interface: + dhcp_int: + enabled: true + name: ${_param:opnfv_fn_vm_primary_interface} + proto: dhcp + type: eth single_int: enabled: true name: ${_param:opnfv_fn_vm_secondary_interface} |