diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-04-07 06:41:40 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-04-26 10:25:03 -0400 |
| commit | d81cd2087be5edf5d2c0d98ad71a63360ae8511f (patch) | |
| tree | fba03b067f3c8e0ec5a1df3a81671dcfba4f0958 /build | |
| parent | 58f6327a3d52e9e84827cd4720fc8cb16fe0627b (diff) | |
Fixing zrpcd is not starting
JIRA: APEX-437
JIRA: APEX-448
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Change-Id: I91c1b3bef83c808166072e00c751d8fac3565b5f
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build_quagga.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 10 |
2 files changed, 8 insertions, 7 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 b256f5ca..ae6d5fe6 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 @@ -106,11 +106,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/ \ |