[baremetal] reclass: Fix class order for common 87/45387/4
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 17 Oct 2017 19:39:20 +0000 (21:39 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 17 Oct 2017 23:01:53 +0000 (01:01 +0200)
commit92530f89c061b0070766e431f839feb368e2e4ac
tree9e5db86bb7666d5d95f9122178d50ee45a3e262e
parent7a1337aeaee3e34ae5c21bb2e9798232f3b2ca28
[baremetal] reclass: Fix class order for common

Inheriting classes in the wrong order led to params being silently
overriden by defaults in the system reclass classes, leaving
some mismatched values between the controller nova config and the
compute conunterpart (e.g. metadata_password had different values).

Always inherit the common class first, so scenario-specific config
is applied on top.

NOTE: {dhcp,single}_nic are not used for mas|kvm|cmp nodes, but they
are referenced in inherited classes, so keep them for now.

Change-Id: I6cb90d5c832ffc8ab731bd9e3cd38ede858dba5c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
44 files changed:
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml