summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Deryugin <aderyugin@mirantis.com>2016-04-13 16:16:57 +0300
committerAlexey Deryugin <aderyugin@mirantis.com>2016-04-13 13:18:58 +0000
commitc5058f15281f5af701ad54503480621633f9eedd (patch)
tree19487ab0c24bd8f18652bb19e53fcc84e3bb8cb9
parenta16435f62e2dc1cc306637558d62df0bf0306554 (diff)
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
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Denis Egorenko <degorenko@mirantis.com> Code-Review+1: Alex Schultz <aschultz@mirantis.com> Code-Review+2: Aleksandr Didenko <adidenko@mirantis.com> Workflow+1: Aleksandr Didenko <adidenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 14 Apr 2016 12:45:58 +0000 Reviewed-on: https://review.openstack.org/295871 Project: openstack/fuel-noop-fixtures Branch: refs/heads/master
-rw-r--r--hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml (renamed from hiera/neut_tun.l3ha-primary-controller.yaml)2
-rwxr-xr-xutils/generate_yamls.sh16
2 files changed, 15 insertions, 3 deletions
diff --git a/hiera/neut_tun.l3ha-primary-controller.yaml b/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml
index a5382b0..e18833c 100644
--- a/hiera/neut_tun.l3ha-primary-controller.yaml
+++ b/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml
@@ -682,7 +682,7 @@ nova:
682 enable_hugepages: false 682 enable_hugepages: false
683 state_path: /var/lib/nova 683 state_path: /var/lib/nova
684 user_password: M7B2W6VRtU0QB7Cv3RRXFYSH 684 user_password: M7B2W6VRtU0QB7Cv3RRXFYSH
685nova_quota: false 685nova_quota: true
686online: true 686online: true
687openstack_version: mitaka-9.0 687openstack_version: mitaka-9.0
688operator_user: 688operator_user:
diff --git a/utils/generate_yamls.sh b/utils/generate_yamls.sh
index 7dd4567..f8e95e1 100755
--- a/utils/generate_yamls.sh
+++ b/utils/generate_yamls.sh
@@ -61,6 +61,15 @@ function enable_neutron_dvr {
61 fuel env --attributes --env $1 --upload 61 fuel env --attributes --env $1 --upload
62} 62}
63 63
64function 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
64function list_free_nodes { 73function list_free_nodes {
65 fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}' 74 fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}'
66} 75}
@@ -92,6 +101,9 @@ function generate_yamls {
92 if [ "${name/murano.sahara.ceil}" != "$name" ] ; then 101 if [ "${name/murano.sahara.ceil}" != "$name" ] ; then
93 enable_murano_sahara_ceilometer $env 102 enable_murano_sahara_ceilometer $env
94 fi 103 fi
104 if [ "${name/nova_quota}" != "$name" ] ; then
105 enable_nova_quota $env
106 fi
95 if [ "${name/ironic}" != "$name" ] ; then 107 if [ "${name/ironic}" != "$name" ] ; then
96 enable_ironic $env 108 enable_ironic $env
97 fi 109 fi
@@ -146,7 +158,7 @@ fuel env --create --name test_neutron_tun --rel 2 --net tun
146generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic' 158generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
147clean_env 'test_neutron_tun' 159clean_env 'test_neutron_tun'
148 160
149# Neutron-l3ha tun 161# Neutron-l3ha tun + nova_quota
150fuel env --create --name test_neutron_tun --rel 2 --net tun 162fuel env --create --name test_neutron_tun --rel 2 --net tun
151generate_yamls 'test_neutron_tun' 'neut_tun.l3ha' 'controller controller controller' 'primary-controller' 163generate_yamls 'test_neutron_tun' 'neut_tun.l3ha.nova_quota' 'controller controller controller' 'primary-controller'
152clean_env 'test_neutron_tun' 164clean_env 'test_neutron_tun'