diff --git a/setup.cfg b/setup.cfg
index 29c807bf95..b482caf2a6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -74,56 +74,58 @@ heat.clients =
     zaqar = heat.engine.clients.os.zaqar:ZaqarClientPlugin
 
 heat.constraints =
-    barbican.secret = heat.engine.clients.os.barbican:SecretConstraint
-    nova.flavor = heat.engine.clients.os.nova:FlavorConstraint
-    nova.host = heat.engine.clients.os.nova:HostConstraint
-    nova.network = heat.engine.clients.os.nova:NetworkConstraint
-    neutron.address_scope = heat.engine.clients.os.neutron.neutron_constraints:AddressScopeConstraint
-    neutron.network = heat.engine.clients.os.neutron.neutron_constraints:NetworkConstraint
-    neutron.port = heat.engine.clients.os.neutron.neutron_constraints:PortConstraint
-    neutron.router = heat.engine.clients.os.neutron.neutron_constraints:RouterConstraint
-    neutron.subnet = heat.engine.clients.os.neutron.neutron_constraints:SubnetConstraint
-    neutron.subnetpool = heat.engine.clients.os.neutron.neutron_constraints:SubnetPoolConstraint
-    neutron.qos_policy = heat.engine.clients.os.neutron.neutron_constraints:QoSPolicyConstraint
-    neutron.lb.provider = heat.engine.clients.os.neutron.neutron_constraints:LBaasV1ProviderConstraint
-    neutron.lbaas.loadbalancer = heat.engine.clients.os.neutron.lbaas_constraints:LoadbalancerConstraint
-    neutron.lbaas.listener = heat.engine.clients.os.neutron.lbaas_constraints:ListenerConstraint
-    neutron.lbaas.pool = heat.engine.clients.os.neutron.lbaas_constraints:PoolConstraint
-    neutron.lbaas.provider = heat.engine.clients.os.neutron.lbaas_constraints:LBaasV2ProviderConstraint
-    glance.image = heat.engine.clients.os.glance:ImageConstraint
-    iso_8601 = heat.engine.constraint.common_constraints:ISO8601Constraint
-    nova.server = heat.engine.clients.os.nova:ServerConstraint
-    nova.keypair = heat.engine.clients.os.nova:KeypairConstraint
-    cinder.volume = heat.engine.clients.os.cinder:VolumeConstraint
-    cinder.snapshot = heat.engine.clients.os.cinder:VolumeSnapshotConstraint
-    cinder.vtype = heat.engine.clients.os.cinder:VolumeTypeConstraint
-    cinder.backup = heat.engine.clients.os.cinder:VolumeBackupConstraint
-    sahara.image = heat.engine.clients.os.sahara:ImageConstraint
-    trove.flavor = heat.engine.clients.os.trove:FlavorConstraint
+    # common constraints
+    cron_expression = heat.engine.constraint.common_constraints:CRONExpressionConstraint
     ip_addr = heat.engine.constraint.common_constraints:IPConstraint
+    iso_8601 = heat.engine.constraint.common_constraints:ISO8601Constraint
     mac_addr = heat.engine.constraint.common_constraints:MACConstraint
     net_cidr = heat.engine.constraint.common_constraints:CIDRConstraint
     test_constr = heat.engine.constraint.common_constraints:TestConstraintDelay
-    keystone.role = heat.engine.clients.os.keystone:KeystoneRoleConstraint
+    timezone = heat.engine.constraint.common_constraints:TimezoneConstraint
+    # service constraints
+    barbican.secret = heat.engine.clients.os.barbican:SecretConstraint
+    cinder.backup = heat.engine.clients.os.cinder:VolumeBackupConstraint
+    cinder.snapshot = heat.engine.clients.os.cinder:VolumeSnapshotConstraint
+    cinder.volume = heat.engine.clients.os.cinder:VolumeConstraint
+    cinder.vtype = heat.engine.clients.os.cinder:VolumeTypeConstraint
+    designate.domain = heat.engine.clients.os.designate:DesignateDomainConstraint
+    glance.image = heat.engine.clients.os.glance:ImageConstraint
     keystone.domain = heat.engine.clients.os.keystone:KeystoneDomainConstraint
-    keystone.project = heat.engine.clients.os.keystone:KeystoneProjectConstraint
     keystone.group = heat.engine.clients.os.keystone:KeystoneGroupConstraint
+    keystone.project = heat.engine.clients.os.keystone:KeystoneProjectConstraint
+    keystone.region = heat.engine.clients.os.keystone:KeystoneRegionConstraint
+    keystone.role = heat.engine.clients.os.keystone:KeystoneRoleConstraint
     keystone.service = heat.engine.clients.os.keystone:KeystoneServiceConstraint
     keystone.user = heat.engine.clients.os.keystone:KeystoneUserConstraint
-    keystone.region = heat.engine.clients.os.keystone:KeystoneRegionConstraint
     magnum.baymodel = heat.engine.clients.os.magnum:BaymodelConstraint
-    manila.share_snapshot = heat.engine.clients.os.manila:ManilaShareSnapshotConstraint
     manila.share_network = heat.engine.clients.os.manila:ManilaShareNetworkConstraint
+    manila.share_snapshot = heat.engine.clients.os.manila:ManilaShareSnapshotConstraint
     manila.share_type = heat.engine.clients.os.manila:ManilaShareTypeConstraint
-    designate.domain = heat.engine.clients.os.designate:DesignateDomainConstraint
-    timezone = heat.engine.constraint.common_constraints:TimezoneConstraint
-    cron_expression = heat.engine.constraint.common_constraints:CRONExpressionConstraint
     monasca.notification = heat.engine.clients.os.monasca:MonascaNotificationConstraint
+    neutron.address_scope = heat.engine.clients.os.neutron.neutron_constraints:AddressScopeConstraint
+    neutron.lbaas.listener = heat.engine.clients.os.neutron.lbaas_constraints:ListenerConstraint
+    neutron.lbaas.loadbalancer = heat.engine.clients.os.neutron.lbaas_constraints:LoadbalancerConstraint
+    neutron.lbaas.pool = heat.engine.clients.os.neutron.lbaas_constraints:PoolConstraint
+    neutron.lbaas.provider = heat.engine.clients.os.neutron.lbaas_constraints:LBaasV2ProviderConstraint
+    neutron.lb.provider = heat.engine.clients.os.neutron.neutron_constraints:LBaasV1ProviderConstraint
+    neutron.network = heat.engine.clients.os.neutron.neutron_constraints:NetworkConstraint
+    neutron.port = heat.engine.clients.os.neutron.neutron_constraints:PortConstraint
+    neutron.qos_policy = heat.engine.clients.os.neutron.neutron_constraints:QoSPolicyConstraint
+    neutron.router = heat.engine.clients.os.neutron.neutron_constraints:RouterConstraint
+    neutron.subnet = heat.engine.clients.os.neutron.neutron_constraints:SubnetConstraint
+    neutron.subnetpool = heat.engine.clients.os.neutron.neutron_constraints:SubnetPoolConstraint
+    nova.flavor = heat.engine.clients.os.nova:FlavorConstraint
+    nova.host = heat.engine.clients.os.nova:HostConstraint
+    nova.keypair = heat.engine.clients.os.nova:KeypairConstraint
+    nova.network = heat.engine.clients.os.nova:NetworkConstraint
+    nova.server = heat.engine.clients.os.nova:ServerConstraint
+    sahara.image = heat.engine.clients.os.sahara:ImageConstraint
     sahara.plugin = heat.engine.clients.os.sahara:PluginConstraint
     senlin.cluster = heat.engine.clients.os.senlin:ClusterConstraint
     senlin.policy_type = heat.engine.clients.os.senlin:PolicyTypeConstraint
     senlin.profile = heat.engine.clients.os.senlin:ProfileConstraint
     senlin.profile_type = heat.engine.clients.os.senlin:ProfileTypeConstraint
+    trove.flavor = heat.engine.clients.os.trove:FlavorConstraint
 
 heat.stack_lifecycle_plugins =