diff options
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index e35a89f1..fa4444a4 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -100,6 +100,7 @@ popd > /dev/null # upload the tacker puppet module and untar it LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ + --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ @@ -116,12 +117,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "puppet module install cristifalcas/etcd" \ --run-command "yum update -y puppet" \ --install "centos-release-qemu-ev" \ - --run-command "yum update -y qemu-kvm-ev" \ + --run-command "yum install -y qemu-kvm-ev-2.3.0-31.el7_2.21.1.x86_64" \ --run-command "yum remove -y qemu-system-x86" \ --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ - --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \ - --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \ + --upload ../noarch/$openstack_congress_pkg:/root/ \ + --install /root/$openstack_congress_pkg \ --install "python2-congressclient" \ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ @@ -162,23 +163,6 @@ git am *.patch popd > /dev/null tar czf ovs.tar.gz ovs -# Required packages to redirect stdin with virt-customize -virt_pkg_str="./$libguestfs_pkg " -wget $virt_uri_base/$libguestfs_pkg -for package in ${virt_pkgs[@]}; do - wget "$virt_uri_base/$package" - virt_pkg_str+=" ./$package" -done - -if ! sudo yum -y install ${virt_pkg_str}; then - if [ "$(rpm -q libguestfs)" != "$(rpm -qpf $libguestfs_pkg)" ]; then - echo "ERROR: Failed to update libguestfs" - exit 1 - fi -fi - - - # BUILD NSH OVS LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../build_ovs_nsh.sh:/root/ \ |