Merge "Reorder configs_query by time"

This commit is contained in:
Jenkins 2017-03-28 13:29:33 +00:00 committed by Gerrit Code Review
commit aa6f282343
2 changed files with 2 additions and 2 deletions

View File

@ -104,7 +104,7 @@ class OpenstackConfigCollection(NailgunCollection):
"""
configs_query = cls.filter_by(
None, cluster_id=cluster.id, is_active=True)
configs_query = configs_query.order_by(cls.single.model.node_role)
configs_query = configs_query.order_by(cls.single.model.created_at)
node_ids = set(n.id for n in nodes)
node_roles = set()

View File

@ -313,7 +313,7 @@ class TestHooksSerializers(BaseTaskSerializationTest):
'DEFAULT/param_b': {'value': 'value_cinder'}
},
'keystone_config': {
'DEFAULT/param_a': {'value': 'value_compute'},
'DEFAULT/param_a': {'value': 'value_cinder'},
}
}})