Change interpolation order to get salt:master:command_timeout: 600

Move class system.salt.master.api after system.salt.master.pkg

The parameter salt:master:command_timeout is responsible for the
timeout waiting responces from minions. With small timeouts,
there is possible getting "Minion did not return. [No response]"
when actual states are executed fine.

system.salt.master.pkg set salt:master:command_timeout to 10
system.salt.master.api set salt:master:command_timeout to 600

Change-Id: I82651b388b416262a78c90f0ef746b0b557be7ca
diff --git a/classes/cluster/os-aio-contrail/infra/config.yml b/classes/cluster/os-aio-contrail/infra/config.yml
index ebcbe3c..9af72a5 100755
--- a/classes/cluster/os-aio-contrail/infra/config.yml
+++ b/classes/cluster/os-aio-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy