summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 13:29:33 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 13:29:33 +0000
commitaa6f282343543e1ed4037fe8a025bcbcf3f20cdc (patch)
tree592d41f4d68e7d99e35719f19fb54bb844842085
parent502d152f41d9f135c3e2405d19bb8267b41529bd (diff)
parent8e12d76f86eccac41469f2f100b8fdab0bec0d6b (diff)
Merge "Reorder configs_query by time"
-rw-r--r--nailgun/nailgun/objects/openstack_config.py2
-rw-r--r--nailgun/nailgun/test/unit/test_stages_task_serialization.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nailgun/nailgun/objects/openstack_config.py b/nailgun/nailgun/objects/openstack_config.py
index bf97622..f6e5ac0 100644
--- a/nailgun/nailgun/objects/openstack_config.py
+++ b/nailgun/nailgun/objects/openstack_config.py
@@ -104,7 +104,7 @@ class OpenstackConfigCollection(NailgunCollection):
104 """ 104 """
105 configs_query = cls.filter_by( 105 configs_query = cls.filter_by(
106 None, cluster_id=cluster.id, is_active=True) 106 None, cluster_id=cluster.id, is_active=True)
107 configs_query = configs_query.order_by(cls.single.model.node_role) 107 configs_query = configs_query.order_by(cls.single.model.created_at)
108 108
109 node_ids = set(n.id for n in nodes) 109 node_ids = set(n.id for n in nodes)
110 node_roles = set() 110 node_roles = set()
diff --git a/nailgun/nailgun/test/unit/test_stages_task_serialization.py b/nailgun/nailgun/test/unit/test_stages_task_serialization.py
index 0b0f0dd..11faa06 100644
--- a/nailgun/nailgun/test/unit/test_stages_task_serialization.py
+++ b/nailgun/nailgun/test/unit/test_stages_task_serialization.py
@@ -313,7 +313,7 @@ class TestHooksSerializers(BaseTaskSerializationTest):
313 'DEFAULT/param_b': {'value': 'value_cinder'} 313 'DEFAULT/param_b': {'value': 'value_cinder'}
314 }, 314 },
315 'keystone_config': { 315 'keystone_config': {
316 'DEFAULT/param_a': {'value': 'value_compute'}, 316 'DEFAULT/param_a': {'value': 'value_cinder'},
317 } 317 }
318 }}) 318 }})
319 319