Merge "remove odl sdnvpn config file"

diff --git a/build/csit-environment.yaml b/build/csit-environment.yaml
index 0225cb2..4ef5501 100644 (file)
--- a/build/csit-environment.yaml
+++ b/build/csit-environment.yaml
@@ -5,6 +5,7 @@ parameters:
 #  CloudDomain:
 
 parameter_defaults:
+  GlanceBackend: file
   CeilometerStoreEvents: true
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 75330f3..e97ae70 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -151,27 +151,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /usr/lib/python2.7/site-packages/ && git apply /tmp/osc_auth_fix.diff" \
     -a overcloud-full_build.qcow2
 
-rm -rf ovs_nsh_patches
-rm -rf ovs
-git clone https://github.com/yyang13/ovs_nsh_patches.git
-git clone https://github.com/openvswitch/ovs.git
-pushd ovs > /dev/null
-git reset --hard 7d433ae57ebb90cd68e8fa948a096f619ac4e2d8
-cp ../ovs_nsh_patches/*.patch ./
-# Hack for build servers that have no git config
-git config user.email "apex@opnfv.com"
-git config user.name "apex"
-git am *.patch
-popd > /dev/null
-tar czf ovs.tar.gz ovs
-
-# BUILD NSH OVS
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \
-    --upload ${BUILD_DIR}/ovs.tar.gz:/root/ \
-    --run-command "cd /root/ && tar xzf ovs.tar.gz" \
-    --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \
-    -a overcloud-full_build.qcow2
-
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
 popd > /dev/null

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'

diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index 3583646..e2d37c8 100644 (file)
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -82,6 +82,8 @@ class DeploySettings(dict):
             if req_set not in deploy_options:
                 if req_set == 'dataplane':
                     self['deploy_options'][req_set] = 'ovs'
+                elif req_set == 'ceph':
+                    self['deploy_options'][req_set] = True
                 else:
                     self['deploy_options'][req_set] = False