CI: drop ceph jobs ulimit config for EL9
It's not needed anymore, since both Ceph and ansible-collection-kolla are setting that by default. Also fix test-core-openstack so it doesn't delete a server before volume attachment test. Change-Id: I20bd352479ee5562514084d0d11063e45e8b956a
This commit is contained in:
parent
a0e614ee10
commit
49d891e85f
@ -122,14 +122,6 @@ enable_rabbitmq: "no"
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if scenario == "cephadm" %}
|
{% if scenario == "cephadm" %}
|
||||||
{% if ansible_facts.distribution == "Rocky" %}
|
|
||||||
docker_custom_config:
|
|
||||||
default-ulimits:
|
|
||||||
nofile:
|
|
||||||
Name: nofile
|
|
||||||
Hard: 1048576
|
|
||||||
Soft: 1048576
|
|
||||||
{% endif %}
|
|
||||||
# kolla-ansible vars
|
# kolla-ansible vars
|
||||||
enable_cinder: "yes"
|
enable_cinder: "yes"
|
||||||
# External Ceph
|
# External Ceph
|
||||||
|
@ -210,16 +210,19 @@ function create_instance {
|
|||||||
attempts=10
|
attempts=10
|
||||||
for i in $(seq 1 ${attempts}); do
|
for i in $(seq 1 ${attempts}); do
|
||||||
if openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}; then
|
if openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}; then
|
||||||
# If the status is not ACTIVE, print info and exit 1
|
# If the status is not ACTIVE, print info, delete instance (for recreation) and exit 1
|
||||||
|
# if exceeded number of attempts
|
||||||
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
|
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
|
||||||
echo "FAILED: Instance is not active"
|
echo "FAILED: Instance is not active"
|
||||||
openstack --debug server show ${name}
|
openstack --debug server show ${name}
|
||||||
openstack server delete ${name}
|
openstack server delete ${name}
|
||||||
|
if [[ $i -eq ${attempts} ]]; then
|
||||||
|
echo "Failed to create instance after ${attempts} attempts"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
elif [[ $i -eq ${attempts} ]]; then
|
|
||||||
echo "Failed to create instance after ${attempts} attempts"
|
|
||||||
else
|
else
|
||||||
echo "Cannot create instance, retrying"
|
echo "Cannot create instance, retrying"
|
||||||
openstack server delete ${name}
|
openstack server delete ${name}
|
||||||
|
Loading…
Reference in New Issue
Block a user