Merge "Rework networking setup for external routers"
diff --git a/de/heat-templates/scripts/functions.sh b/de/heat-templates/scripts/functions.sh
index 104a442..871ebf9 100644
--- a/de/heat-templates/scripts/functions.sh
+++ b/de/heat-templates/scripts/functions.sh
@@ -62,7 +62,7 @@
# Change default VXLAN port, need for https://mirantis.jira.com/browse/PRODX-11679
UCP_DOCKER_SWARM_DATA_PORT=${UCP_DOCKER_SWARM_DATA_PORT:-4789}
UCP_DOCKER_CALICO_VXLAN_PORT=${UCP_DOCKER_CALICO_VXLAN_PORT:-${UCP_DOCKER_SWARM_DATA_PORT}}
-NTP_SERVERS=${NTP_SERVERS:-"ldap.scc.mirantis.net ldap.bud.mirantis.net"}
+NTP_SERVERS=${NTP_SERVERS:-"0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"}
IRONIC_BAREMETAL_VXLAN_INTERFACE='vxlan10'
HUGE_PAGES_1G_SIZE=$(echo "${HUGE_PAGES}" | awk -F ',' '{print $1}')
HUGE_PAGES_2Mb_SIZE=$(echo "${HUGE_PAGES}" | awk -F ',' '{print $2}')
diff --git a/hco/configs/cdi.toml b/hco/configs/cdi.toml
new file mode 100644
index 0000000..5a9835f
--- /dev/null
+++ b/hco/configs/cdi.toml
@@ -0,0 +1,3 @@
+[plugins]
+ [plugins."io.containerd.grpc.v1.cri"]
+ device_ownership_from_security_context = true
diff --git a/hco/fragments/VMInstanceCeph.yaml b/hco/fragments/VMInstanceCeph.yaml
index 199d10d..1ba516d 100644
--- a/hco/fragments/VMInstanceCeph.yaml
+++ b/hco/fragments/VMInstanceCeph.yaml
@@ -121,6 +121,10 @@
owner: "root:root"
permissions: "0644"
content: { get_param: hardware_metadata}
+ - path: /etc/k0s/containerd.d/cdi.toml
+ owner: "root:root"
+ permissions: "0644"
+ content: {get_file: ../configs/cdi.toml}
install_config_agent:
type: "OS::Heat::MultipartMime"