summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-odl-ha/infra
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-ha/infra')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j25
2 files changed, 1 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
index ef874cdb5..9ff091941 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
@@ -29,7 +29,7 @@ parameters:
odl0{{ i }}:
name: ${_param:opendaylight_server_node0{{ i }}_hostname}
provider: ${_param:infra_kvm_node0{{ i }}_hostname}.${_param:cluster_domain}
- image: ${_param:salt_control_xenial_image}
+ image: ${_param:salt_control_bionic_image}
size: opendaylight.server
{%- if conf.nodes[nm.ctl01.idx].node.arch == 'aarch64' %}
machine: virt
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
index ff9eff551..3a87ab558 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
@@ -10,8 +10,3 @@
classes:
- cluster.mcp-odl-ha.infra
- cluster.all-mcp-arch-common.infra.maas
-{%- if 'aarch64' not in nm.cluster.arch %}
-parameters:
- _param:
- hwe_kernel: 'ga-16.04'
-{%- endif %}