From 7d9495aec0340d743bf0e59db5b7360bef013004 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Tue, 8 Aug 2017 14:29:56 -0400
Subject: Fixes OpenDaylight version

The default version is now Carbon with the option of using
nitrogen (master) for puppet-odl and opendaylight.

JIRA: APEX-500

Change-Id: I44d02ec0db5fb8e6342e5ab6802a5a3f302b8511
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 lib/overcloud-deploy-functions.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 0fe838d0..9c9ea188 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -281,7 +281,9 @@ EOI
     case "${deploy_options_array['odl_version']}" in
       carbon) odl_version=''
               ;;
-      *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}.  Please use 'carbon'.${reset}"
+      nitrogen) odl_version='nitrogen'
+              ;;
+      *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}.  Please use 'carbon' or 'nitrogen'.${reset}"
          exit 1
          ;;
     esac
@@ -290,16 +292,9 @@ EOI
         ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
           LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
                                                    --run-command "yum -y install /root/${odl_version}/*" \
+                                                   --run-command "rm -rf /etc/puppet/modules/opendaylight" \
+                                                   --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-master.tar.gz" \
                                                    -a overcloud-full.qcow2
-EOI
-    fi
-
-    # Overwrite puppet-opendaylight with carbon. By default we install boron branch.
-    if [ "${deploy_options_array['odl_version']}" == 'carbon' ]; then
-      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-        LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /etc/puppet/modules/opendaylight" \
-                                                 --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-carbon.tar.gz" \
-                                                 -a overcloud-full.qcow2
 EOI
     fi
   fi
-- 
cgit 1.2.3-korg