Fix odl_version text with comments (Boron->boron).

At present, odl_version is case-sensitive hence opnfv-deploy fail
with 'odl_version: Boron'. So the change fix it.

Change-Id: Ifd611c56b9802b4c5033728e70cce03eb55985cf
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index ee1dc14..ea35ae7 100644 (file)
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -14,9 +14,9 @@ deploy_options:
   sdn_controller: opendaylight
 
   # Which version of ODL to use. This is only valid if 'opendaylight' was used
-  # above. If 'Boron' is specified, ODL Boron will be used. If no value is specified,
-  # Lithium will be used.
-  #odl_version: Boron
+  # above. Valid options are 'beryllium', 'boron' and 'carbon'. If no value
+  # is specified, Beryllium will be used.
+  #odl_version: boron
 
   # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and
   # use ODL instead.

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 169640f..216fa6c 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -130,6 +130,8 @@ EOI
   # Set ODL version accordingly
   if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then
     case "${deploy_options_array['odl_version']}" in
+      beryllium) odl_version=''
+              ;;
       boron)  odl_version='boron'
               ;;
       cabron) odl_version='master'