diff options
| -rwxr-xr-x | build/build_quagga.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 10 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 11 |
3 files changed, 13 insertions, 13 deletions
diff --git a/build/build_quagga.sh b/build/build_quagga.sh index 7d298e57..a682b54e 100755 --- a/build/build_quagga.sh +++ b/build/build_quagga.sh @@ -180,9 +180,10 @@ After=network.service [Service] ExecStart=/usr/sbin/zrpcd -Type=forking +Type=simple +ExecStartPre=-/usr/bin/mkdir /var/run/quagga/ +ExecStartPre=/usr/bin/chown -R quagga:quagga /var/run/quagga/ PIDFile=/var/run/zrpcd.pid -Restart=on-failure [Install] WantedBy=default.target diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 131427c3..ca5ee068 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -74,7 +74,7 @@ git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar. popd > /dev/null # Download quagga/zrpc rpms -populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-2.tar.gz +populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz # Download ODL netvirt for VPP populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/odl-netvirt-vpp-distribution.tar.gz @@ -105,11 +105,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install python-click \ --upload ${CACHE_DIR}/$gluon_rpm:/root/\ --install /root/$gluon_rpm \ - --upload ${CACHE_DIR}/quagga-2.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf quagga-2.tar.gz" \ + --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \ --run-command "yum downgrade -y python-zmq-14.3.1" \ - --install zeromq-4.1.4,zeromq-devel-4.1.4 \ - --install capnproto-devel,capnproto-libs,capnproto \ + --install zeromq-4.1.4 \ + --install capnproto-libs,capnproto \ --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \ --upload ${BUILD_ROOT}/patches/disable_odl_clustering.patch:/etc/puppet/modules/tripleo/ \ --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \ diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 8ce05442..efacaf83 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -122,12 +122,11 @@ EOI if [ "${deploy_options_array['vpn']}" == 'True' ]; then echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y install /root/quagga/*.rpm" \ - --run-command "sudo usermod -a -G quaggavt quagga" \ - --run-command "sudo mkdir -p /var/run/quagga/" \ - --run-command "sudo chown quagga:quagga -R /var/run/quagga/" \ - --run-command "systemctl enable zrpcd" \ - -a overcloud-full.qcow2 + LIBGUESTFS_BACKEND=direct virt-customize \ + --run-command "cd /root/quagga; packages=\\\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \\\$packages" \ + --run-command "sudo usermod -a -G quaggavt quagga" \ + --run-command "systemctl enable zrpcd" \ + -a overcloud-full.qcow2 EOI fi |