Skip to content
Snippets Groups Projects

Add metadata indicating if a machine is puppet or not

Merged Daniel Juarez Gonzalez requested to merge add_puppet_phy into master
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
+ 2
2
@@ -178,12 +178,12 @@ while [[ ${#TOBETESTED[@]} -gt 0 ]]; do
@@ -178,12 +178,12 @@ while [[ ${#TOBETESTED[@]} -gt 0 ]]; do
DELAY=$(($RANDOM % 10))
DELAY=$(($RANDOM % 10))
t_Log "Wait ${DELAY} seconds"
t_Log "Wait ${DELAY} seconds"
sleep $DELAY
sleep $DELAY
cmd="ai-bs --nova-sshkey imageci --landb-responsible imageci --nova-property centos_test_cleanup=true --nova-flavor '${flavor}' --nova-image '${IMAGE}' --foreman-hostgroup '${PUPPET_HOSTGROUP}' --foreman-environment '${PUPPET_ENVIRONMENT}' '${p_name}'"
cmd="ai-bs --nova-sshkey imageci --landb-responsible imageci --nova-property centos_test_cleanup=true --nova-property puppet_managed=true --nova-flavor '${flavor}' --nova-image '${IMAGE}' --foreman-hostgroup '${PUPPET_HOSTGROUP}' --foreman-environment '${PUPPET_ENVIRONMENT}' '${p_name}'"
t_BoldGreen "${cmd}"
t_BoldGreen "${cmd}"
testStart "${TESTTYPE}-${flavor}" "create"
testStart "${TESTTYPE}-${flavor}" "create"
cmd_output=$(eval ${cmd} 2>&1)
cmd_output=$(eval ${cmd} 2>&1)
else
else
cmd="openstack server create --key-name imageci --property landb-responsible=imageci --property centos_test_cleanup=true --flavor '${flavor}' --image '${IMAGE}' '${p_name}'"
cmd="openstack server create --key-name imageci --property landb-responsible=imageci --property centos_test_cleanup=true --property puppet_managed=false --flavor '${flavor}' --image '${IMAGE}' '${p_name}'"
t_BoldGreen "${cmd}"
t_BoldGreen "${cmd}"
testStart "${TESTTYPE}-${flavor}" "create"
testStart "${TESTTYPE}-${flavor}" "create"
cmd_output=$(eval ${cmd} -c id --format value 2>&1)
cmd_output=$(eval ${cmd} -c id --format value 2>&1)
Loading