1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
-index 88437cd..31eaef7 100644
+index 2142baf..415f63c 100644
--- a/mcp/config/labs/local/idf-virtual1.yaml
+++ b/mcp/config/labs/local/idf-virtual1.yaml
@@ -41,9 +41,9 @@ idf:
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 1b50025..9ec2dbd 100644
+index 22d5a7a..1229fc5 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -18,3 +18,4 @@
- /usr/share/salt-formulas/env: 0011-routes-Skip-network-restart-on-noifupdown.patch
- /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
+ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index c147728..6d7c0b4 100755
+index d3a255d..9bfe535 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
-@@ -32,6 +32,7 @@ salt -C 'cmp*' state.apply linux.network || true
+@@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
args='unset new_routers'
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 9ec2dbd..84756cd 100644
+index 1229fc5..3af44ef 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -19,3 +19,5 @@
- /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 84756cd..9396093 100644
+index 3af44ef..3f2e99a 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -21,3 +21,4 @@
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Charalampos Kominos <charalampos.kominos@enea.com>
-Date: Thu, 24 Aug 2017 19:28:14 +0200
-Subject: [PATCH] aarch64: skip configuration of hugepages
-
-The reclass model contains instructions on how to setup nova.conf.
-Those instructions need to be overwritten for ARM.
-
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
-Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
----
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index dd610ea..407751f 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-@@ -11,8 +11,8 @@ classes:
- - system.linux.system.repo.glusterfs
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
-- - system.nova.compute.nfv.hugepages
-- - system.nova.compute.nfv.cpu_pinning
-+ # - system.nova.compute.nfv.hugepages
-+ # - system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 6d7c0b4..a7043d9 100755
+index 9bfe535..82649df 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
cluster_node01_address: ${_param:infra_kvm_node01_address}
cluster_node02_address: ${_param:infra_kvm_node02_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index 407751f..b0e23d0 100644
+index dd610ea..6aa7b5d 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -35,7 +35,7 @@ parameters:
-Subproject commit ed8fc8fe0b2ce8058b8c14e84c4119d93acc6f76
+Subproject commit a2062e5fd64a2737df44497bfcece7e804b7f5bf