target nova and neutron by roles
Change-Id: I17f733bb655e61805996d8cf4e076f6fee9f554c
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index c391e16..6dba9f6 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -316,8 +316,8 @@
// Install and check nova service
//runSaltProcessStep(saltMaster, 'I@nova:controller', 'state.sls', ['nova'], 1)
- salt.enforceState(saltMaster, 'I@nova:controller and *01*', 'nova', true)
- salt.enforceState(saltMaster, 'I@nova:controller', 'nova', true)
+ salt.enforceState(saltMaster, 'I@nova:controller and *01*', 'nova.controller', true)
+ salt.enforceState(saltMaster, 'I@nova:controller', 'nova.controller', true)
salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; nova service-list'], null, true)
// Install and check cinder service
@@ -329,8 +329,8 @@
// Install neutron service
//runSaltProcessStep(saltMaster, 'I@neutron:server', 'state.sls', ['neutron'], 1)
- salt.enforceState(saltMaster, 'I@neutron:server and *01*', 'neutron', true)
- salt.enforceState(saltMaster, 'I@neutron:server', 'neutron', true)
+ salt.enforceState(saltMaster, 'I@neutron:server and *01*', 'neutron.server', true)
+ salt.enforceState(saltMaster, 'I@neutron:server', 'neutron.server', true)
salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; neutron agent-list'], null, true)
// Install heat service