diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-ha')
3 files changed, 2 insertions, 7 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 %} diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index 531e01f92..23d1072d7 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -14,7 +14,7 @@ classes: {%- endif %} parameters: _param: - linux_system_codename: xenial + linux_system_codename: bionic opendaylight: server: odl_bind_ip: ${_param:single_address} |