From fab511daabb05c493943b5f7a2ea8b5fe0802e2d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 7 Oct 2019 17:07:31 +0200 Subject: [baremetal] Stein, Bionic, py3 support Change-Id: If3f8cb6bfeedeb766a050d5a271b21c90bb3ba1c Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 | 2 +- mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-odl-ha/infra') 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 %} -- cgit 1.2.3-korg