diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-ovn-nofeature-ha.yaml | 26 | ||||
| -rwxr-xr-x | mcp/config/states/baremetal_init | 2 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml b/mcp/config/scenario/os-ovn-nofeature-ha.yaml new file mode 100644 index 000000000..6efc11a3f --- /dev/null +++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml @@ -0,0 +1,26 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +cluster: + domain: mcp-pike-ovn-ha.local + states: + - maas + - baremetal_init + - virtual_control_plane + - openstack_ha + - networks +virtual: + nodes: + - cfg01 + - mas01 + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index d3a255d48..a7941e00e 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -27,7 +27,7 @@ salt -C 'kvm*' state.apply linux.network,linux.system.kernel salt -C 'kvm* or cmp*' state.apply salt.minion salt -C 'cmp*' state.apply linux.system # wrap distro `route` binary to silence errors when route already exists -salt -C 'cmp*' state.apply opnfv.route_wrapper +wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper" salt -C 'cmp*' state.apply linux.network || true wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 48e45d426..80c0c87e6 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -57,6 +57,7 @@ wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_ # Disable proxy dhcp routes after installation salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ args='unset new_routers' +salt -C 'prx*' state.apply opnfv.route_wrapper salt -C 'prx*' system.reboot wait_for 30.0 "salt -C 'prx*' test.ping" |