Merge "Setup repository with backports"
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 10 Apr 2019 08:38:52 +0000 (08:38 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 10 Apr 2019 08:38:52 +0000 (08:38 +0000)
1  2 
mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2

@@@ -8,7 -8,6 +8,6 @@@
  {%- import 'net_map.j2' as nm with context %}
  ---
  classes:
-   - system.linux.system.repo.mcp.apt_mirantis.openstack
    - service.keepalived.cluster.single
    - system.glusterfs.server.volume.glance
    - system.glusterfs.server.volume.keystone
@@@ -22,6 -21,7 +21,7 @@@
    # - system.salt.control.cluster.stacklight_server_cluster
    # - system.salt.control.cluster.stacklight_log_cluster
    # - system.salt.control.cluster.stacklight_telemetry_cluster
+   - cluster.all-mcp-arch-common.backports
    - cluster.mcp-common-ha.glusterfs_repo
    - cluster.mcp-common-ha.infra.kvm_pdf
    - cluster.all-mcp-arch-common.opnfv.maas_proxy
@@@ -101,8 -101,6 +101,8 @@@ parameters
              mdb01: &salt_control_xenial_image_common_attr
                image: ${_param:salt_control_xenial_image}
  {%- if conf.nodes[nm.ctl01.idx].node.arch == 'aarch64' %}
 +              seed: qemu-nbd
 +              ~cloud_init: ~
                machine: virt
                cpu_mode: host-passthrough
                loader: