diff options
| -rwxr-xr-x | build/instack.sh | 25 | ||||
| -rwxr-xr-x | ci/deploy.sh | 15 |
2 files changed, 18 insertions, 22 deletions
diff --git a/build/instack.sh b/build/instack.sh index 52384689..72e3a57f 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -261,23 +261,6 @@ git checkout stable/liberty popd tar -czf puppet-aodh.tar.gz aodh -# 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 "mount -o remount,inode64 /" -RemainAfterExit=no - -[Install] -WantedBy=multi-user.target -EOF - # Add epel, aodh and ceph, remove openstack-neutron-openvswitch AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer" AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier" @@ -373,13 +356,15 @@ pushd puppet-opendaylight git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz popd +# 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.x86_64.rpm' \ + --install 'https://radez.fedorapeople.org/kernel-ml-3.13.7-1.el7.centos_xfs_grow.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.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' \ + --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' \ --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum remove -y opendaylight" \ --run-command "yum clean all" \ diff --git a/ci/deploy.sh b/ci/deploy.sh index bcd28f87..2e3bea71 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -30,7 +30,6 @@ else fi vm_index=4 -#ha_enabled="TRUE" interactive="FALSE" ping_site="8.8.8.8" ntp_server="pool.ntp.org" @@ -762,6 +761,15 @@ sudo sed -i '/CephClusterFSID:/c\\ CephClusterFSID: \\x27$(cat /proc/sys/kernel sudo sed -i '/CephMonKey:/c\\ CephMonKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml sudo sed -i '/CephAdminKey:/c\\ CephAdminKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml +# we assume that packages will not need to be updated with undercloud install +# and that it will be used only to configure the undercloud +# packages updates would need to be handled manually with yum update +sudo cp -f /usr/share/diskimage-builder/elements/yum/bin/install-packages /usr/share/diskimage-builder/elements/yum/bin/install-packages.bak +cat << 'EOF' | sudo tee /usr/share/diskimage-builder/elements/yum/bin/install-packages > /dev/null +#!/bin/sh +exit 0 +EOF + openstack undercloud install &> apex-undercloud-install.log sleep 30 sudo systemctl restart openstack-glance-api @@ -824,7 +832,7 @@ function undercloud_prep_overcloud_deploy { compute_nodes=$((total_nodes - 3)) DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml" else - compute_nodes=$((total_nodes - 1)) + compute_nodes=1 fi if [ "$compute_nodes" -le 0 ]; then @@ -851,6 +859,9 @@ function undercloud_prep_overcloud_deploy { echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI +if [ "$debug" == 'TRUE' ]; then + LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex +fi source stackrc set -o errexit echo "Uploading overcloud glance images" |