Enable nova_quota for noop tests
We need to have an ability to test nova_quota option using fuel noop tests. Change-Id: I027e5ff5b0246f8d1fb9a9e715cf8ee854f4a847 Related-Bug: #1519722
This commit is contained in:
parent
a16435f62e
commit
c5058f1528
@ -682,7 +682,7 @@ nova:
|
|||||||
enable_hugepages: false
|
enable_hugepages: false
|
||||||
state_path: /var/lib/nova
|
state_path: /var/lib/nova
|
||||||
user_password: M7B2W6VRtU0QB7Cv3RRXFYSH
|
user_password: M7B2W6VRtU0QB7Cv3RRXFYSH
|
||||||
nova_quota: false
|
nova_quota: true
|
||||||
online: true
|
online: true
|
||||||
openstack_version: mitaka-9.0
|
openstack_version: mitaka-9.0
|
||||||
operator_user:
|
operator_user:
|
@ -61,6 +61,15 @@ function enable_neutron_dvr {
|
|||||||
fuel env --attributes --env $1 --upload
|
fuel env --attributes --env $1 --upload
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function enable_nova_quota {
|
||||||
|
fuel env --attributes --env $1 --download
|
||||||
|
ruby -ryaml -e '
|
||||||
|
attr = YAML.load(File.read(ARGV[0]))
|
||||||
|
attr["editable"]["common"]["nova_quota"]["value"] = true
|
||||||
|
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||||
|
fuel env --attributes --env $1 --upload
|
||||||
|
}
|
||||||
|
|
||||||
function list_free_nodes {
|
function list_free_nodes {
|
||||||
fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}'
|
fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}'
|
||||||
}
|
}
|
||||||
@ -92,6 +101,9 @@ function generate_yamls {
|
|||||||
if [ "${name/murano.sahara.ceil}" != "$name" ] ; then
|
if [ "${name/murano.sahara.ceil}" != "$name" ] ; then
|
||||||
enable_murano_sahara_ceilometer $env
|
enable_murano_sahara_ceilometer $env
|
||||||
fi
|
fi
|
||||||
|
if [ "${name/nova_quota}" != "$name" ] ; then
|
||||||
|
enable_nova_quota $env
|
||||||
|
fi
|
||||||
if [ "${name/ironic}" != "$name" ] ; then
|
if [ "${name/ironic}" != "$name" ] ; then
|
||||||
enable_ironic $env
|
enable_ironic $env
|
||||||
fi
|
fi
|
||||||
@ -146,7 +158,7 @@ fuel env --create --name test_neutron_tun --rel 2 --net tun
|
|||||||
generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
|
generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
|
||||||
clean_env 'test_neutron_tun'
|
clean_env 'test_neutron_tun'
|
||||||
|
|
||||||
# Neutron-l3ha tun
|
# Neutron-l3ha tun + nova_quota
|
||||||
fuel env --create --name test_neutron_tun --rel 2 --net tun
|
fuel env --create --name test_neutron_tun --rel 2 --net tun
|
||||||
generate_yamls 'test_neutron_tun' 'neut_tun.l3ha' 'controller controller controller' 'primary-controller'
|
generate_yamls 'test_neutron_tun' 'neut_tun.l3ha.nova_quota' 'controller controller controller' 'primary-controller'
|
||||||
clean_env 'test_neutron_tun'
|
clean_env 'test_neutron_tun'
|
||||||
|
Loading…
Reference in New Issue
Block a user