diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/defaults-aarch64.yaml | 5 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml index 74bf8b116..1efa12ae4 100644 --- a/mcp/config/scenario/defaults-aarch64.yaml +++ b/mcp/config/scenario/defaults-aarch64.yaml @@ -18,10 +18,7 @@ virtual: repos: # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp> - saltstack 500 deb [arch=arm64] http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11 xenial main - - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike main - - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly pike - # NOTE(armband): Empty repo, keep commented out as reference - # - armband_mcp_extra 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly extra + - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main pkg: install: - linux-image-generic-hwe-16.04-edge diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index d92e99232..3856bef10 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,8 +27,6 @@ if [ "${ERASE_ENV}" -eq 1 ]; then fi # KVM libvirt first, VCP deployment -#FIXME Should be removed once upstream patch get merged -salt -C 'kvm*' group.add libvirtd wait_for 5 "salt -C 'kvm*' state.sls libvirt" salt -C 'kvm* or cmp*' state.apply salt |