Exchange applying order compute with cinder configuration

[Ksenia Svechnikova]

Detailed bug description:

Test Apply config for node with multiple role fail with AssertionError: https://product-ci.infra.mirantis.net/job/9.0.system_test.ubuntu.services_reconfiguration_thread_1/116/testReport/(root)/apply_config_for_node_with_multiple_role/

Steps to reproduce: Run test 'apply_config_for_node_with_multiple_role'

Expected results: Test pass

Actual result: AssertionError: Expected that the option "default_ephemeral_format" has value "ext4" in config file /etc/nova/nova.conf but actually has value "ext3": FAIL

Description of the environment: 9.0 mos iso #416

Additional information: The root cause is in new order of config execution. Previously it was 'compute, cinder' and openstack-config tasks were executed in this order. But now we can see that they are executed in ID-priority way:

[root@nailgun ~]# fuel2 openstack-config list --env 1
+----+-----------+-------------+------------+---------+------------+
| id | is_active | config_type | cluster_id | node_id | node_role |
+----+-----------+-------------+------------+---------+------------+
| 4 | True | role | 1 | None | controller |
| 7 | True | role | 1 | None | cinder |
| 8 | True | role | 1 | None | compute |
+----+-----------+-------------+------------+---------+------------+
====> compute conf was executed

[root@nailgun ~]# fuel2 openstack-config list --env 1
+----+-----------+-------------+------------+---------+------------+
| id | is_active | config_type | cluster_id | node_id | node_role |
+----+-----------+-------------+------------+---------+------------+
| 4 | True | role | 1 | None | controller |
| 8 | True | role | 1 | None | compute |
| 9 | True | role | 1 | None | cinder |
+----+-----------+-------------+------------+---------+------------+
[root@nailgun ~]#
==> cinder conf

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/323375

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/323738

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/323375
Committed: https://git.openstack.org/cgit/openstack/fuel-qa/commit/?id=44555374e72930c0e0f7eedaeb2341fe9d2b9eae
Submitter: Jenkins
Branch: master

commit 44555374e72930c0e0f7eedaeb2341fe9d2b9eae
Author: Ksenia Demina <email address hidden>
Date: Tue May 31 16:30:26 2016 +0300

    Change checkers of config's applying order

    Now for a node with multi-roles configs fot the same section
    are merging by ID-priority. Thus last config for cinder will
    be have higher priority and will rewrite compute config

    Change-Id: Ic35a6c5efb05974dc7ab7ae36cc175a91471c778
    Closes-Bug: #1587023

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/323738
Committed: https://git.openstack.org/cgit/openstack/fuel-qa/commit/?id=a95e465336d20807f8efc548d9069f4fec02693f
Submitter: Jenkins
Branch: stable/mitaka

commit a95e465336d20807f8efc548d9069f4fec02693f
Author: Ksenia Demina <email address hidden>
Date: Tue May 31 16:30:26 2016 +0300

    Change checkers of config's applying order

    Now for a node with multi-roles configs fot the same section
    are merging by ID-priority. Thus last config for cinder will
    be have higher priority and will rewrite compute config

    Change-Id: Ic35a6c5efb05974dc7ab7ae36cc175a91471c778
    Closes-Bug: #1587023

[Ksenia Svechnikova (kdemina)]

Test pass 10 last runs (fuel-9.0-mos-485-2016-06-14 and more older)

[Dmitry Belyaninov (dbelyaninov)]

reproduced on 10 SWARM

https://product-ci.infra.mirantis.net/job/10.0.system_test.ubuntu.services_reconfiguration_thread_1/180/testReport/(root)/apply_config_for_node_with_multiple_role/apply_config_for_node_with_multiple_role/

Expected that the option "default_ephemeral_format" has value "ext3" in config file /etc/nova/nova.conf but actually has value "ext4": FAIL

[Alexander Kurenyshev (akurenyshev)]

The same is here https://product-ci.infra.mirantis.net/job/10.0.system_test.ubuntu.services_reconfiguration_thread_1/181/console