Browse Source

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
Alexey Deryugin 3 years ago
parent
commit
c5058f1528
2 changed files with 15 additions and 3 deletions
  1. 1
    1
      hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml
  2. 14
    2
      utils/generate_yamls.sh

hiera/neut_tun.l3ha-primary-controller.yaml → hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml View File

@@ -682,7 +682,7 @@ nova:
682 682
   enable_hugepages: false
683 683
   state_path: /var/lib/nova
684 684
   user_password: M7B2W6VRtU0QB7Cv3RRXFYSH
685
-nova_quota: false
685
+nova_quota: true
686 686
 online: true
687 687
 openstack_version: mitaka-9.0
688 688
 operator_user:

+ 14
- 2
utils/generate_yamls.sh View File

@@ -61,6 +61,15 @@ function enable_neutron_dvr {
61 61
   fuel env --attributes --env $1 --upload
62 62
 }
63 63
 
64
+function enable_nova_quota {
65
+  fuel env --attributes --env $1 --download
66
+  ruby -ryaml -e '
67
+  attr = YAML.load(File.read(ARGV[0]))
68
+  attr["editable"]["common"]["nova_quota"]["value"] = true
69
+  File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
70
+  fuel env --attributes --env $1 --upload
71
+}
72
+
64 73
 function list_free_nodes {
65 74
   fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}'
66 75
 }
@@ -92,6 +101,9 @@ function generate_yamls {
92 101
   if [ "${name/murano.sahara.ceil}" != "$name" ] ; then
93 102
     enable_murano_sahara_ceilometer $env
94 103
   fi
104
+  if [ "${name/nova_quota}" != "$name" ] ; then
105
+    enable_nova_quota $env
106
+  fi
95 107
   if [ "${name/ironic}" != "$name" ] ; then
96 108
     enable_ironic $env
97 109
   fi
@@ -146,7 +158,7 @@ fuel env --create --name test_neutron_tun --rel 2 --net tun
146 158
 generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
147 159
 clean_env 'test_neutron_tun'
148 160
 
149
-# Neutron-l3ha tun
161
+# Neutron-l3ha tun + nova_quota
150 162
 fuel env --create --name test_neutron_tun --rel 2 --net tun
151
-generate_yamls 'test_neutron_tun' 'neut_tun.l3ha' 'controller controller controller' 'primary-controller'
163
+generate_yamls 'test_neutron_tun' 'neut_tun.l3ha.nova_quota' 'controller controller controller' 'primary-controller'
152 164
 clean_env 'test_neutron_tun'

Loading…
Cancel
Save