sfc and odl version updates

  - reverting the patched growfs bug kernel
  - updating ODL to RC 3.1
  - syntax fix on error inventory syntax check

Change-Id: I4c8f2bd648a2caa1caa2d33650bf1b73824f7179
Signed-off-by: Dan Radez <dradez@redhat.com>
cherry-picked from 01b56b61e6dc1f4eb34787fca498eb624a2dcb64

diff --git a/build/instack.sh b/build/instack.sh
index 60290d4..e748d91 100755 (executable)
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -330,6 +330,23 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../aodh-tripleoclient.patch:/t
 #####    Adding SFC+OpenDaylight overcloud #####
 ################################################
 
+# work around for XFS grow bug
+# http://xfs.org/index.php/XFS_FAQ#Q:_Why_do_I_receive_No_space_left_on_device_after_xfs_growfs.3F
+cat > /tmp/xfs-grow-remount-fix.service << EOF
+[Unit]
+Description=XFS Grow Bug Remount
+After=network.target
+Before=getty@tty1.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c "echo 'XFS Grow Bug Remount Sleeping 180s' && sleep 180 && echo 'XFS Grow Bug Remounting Now' && mount -o remount,inode64 /"
+RemainAfterExit=no
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
 
 #copy opendaylight overcloud full to isolate odl-sfc
 cp overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc.qcow2
@@ -337,12 +354,15 @@ cp overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc.qcow2
 # kernel is patched with patch from this post
 # http://xfs.org/index.php/XFS_FAQ#Q:_Why_do_I_receive_No_space_left_on_device_after_xfs_growfs.3F
 LIBGUESTFS_BACKEND=direct virt-customize \
-    --install 'https://radez.fedorapeople.org/kernel-ml-3.13.7-1.el7.centos_xfs_grow.x86_64.rpm' \
+    --upload "/tmp/xfs-grow-remount-fix.service:/etc/systemd/system/xfs-grow-remount-fix.service" \
+    --run-command "chmod 664 /etc/systemd/system/xfs-grow-remount-fix.service" \
+    --run-command "systemctl enable xfs-grow-remount-fix.service" \
+    --install 'https://radez.fedorapeople.org/kernel-ml-3.13.7-1.el7.centos.x86_64.rpm' \
     --run-command 'grub2-set-default "\$(grep -P \"submenu|^menuentry\" /boot/grub2/grub.cfg | cut -d \"\\x27\" | head -n 1)"' \
     --install 'https://radez.fedorapeople.org/openvswitch-kmod-2.3.90-1.el7.centos.x86_64.rpm' \
     --run-command 'yum downgrade -y https://radez.fedorapeople.org/openvswitch-2.3.90-1.x86_64.rpm' \
-    --run-command 'rm -f /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/net/openvswitch/openvswitch.ko' \
-    --run-command 'ln -s /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/extra/openvswitch/openvswitch.ko /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/net/openvswitch/openvswitch.ko' \
+    --run-command 'rm -f /lib/modules/3.13.7-1.el7.centos.x86_64/kernel/net/openvswitch/openvswitch.ko' \
+    --run-command 'ln -s /lib/modules/3.13.7-1.el7.centos.x86_64/kernel/extra/openvswitch/openvswitch.ko /lib/modules/3.13.7-1.el7.centos.x86_64/kernel/net/openvswitch/openvswitch.ko' \
     -a overcloud-full-opendaylight-sfc.qcow2
 
 

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 931881d..c89dd58 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -303,7 +303,10 @@ parse_inventory_file() {
     exit 1
   fi
 
-  eval $(parse_yaml $INVENTORY_FILE) || ( echo "${red}Failed to parse inventory.yaml. Aborting.${reset}" && exit 1 )
+  eval $(parse_yaml $INVENTORY_FILE) || {
+      echo "${red}Failed to parse inventory.yaml. Aborting.${reset}" &&
+      exit 1
+  }
 
   instack_env_output="
 {