diff options
| author |   Michael Chapman <michapma@redhat.com> | 2017-07-07 02:29:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-07 02:29:12 +0000 |
| commit | 68bb8c986bfdca528a06e18e58507b4750fdf40e (patch) | |
| tree | ea622722b44385268a8bb930e598e741dc4f5308 | |
| parent | 85d68ef3be89293b9dd9525d05f6de0b06d9fab3 (diff) | |
| parent | 9267deb089e40ca8352e14392d32dcbc5480f319 (diff) | |
Merge "Tiny fix for easy install scirpt"
| -rwxr-xr-x | ci/dev_dep_check.sh | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | contrib/simple_deploy.sh | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh index fe4976a1..7a14563c 100755 --- a/ci/dev_dep_check.sh +++ b/ci/dev_dep_check.sh @@ -35,7 +35,8 @@ fi for i in epel-release python34-PyYAML openvswitch libguestfs \ libguestfs-tools-c libvirt-python python2-oslo-config \ python2-debtcollector python34-devel libxslt-devel \ - libxml2-devel python-virtualbmc python34-jinja2 python34-pip; do + libxml2-devel python-virtualbmc python34-jinja2 python34-pip \ + rpm-build wget libvirt ntpdate; do # Make sure deploy deps are installed if ! rpm -q $i > /dev/null; then if ! sudo yum install -y $i; then diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh index 0b9b6caa..24b67904 100644..100755 --- a/contrib/simple_deploy.sh +++ b/contrib/simple_deploy.sh @@ -15,5 +15,6 @@ popd pushd $apex_home/ci echo "All further output will be piped to $PWD/nohup.out" (nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl-nofeature-noha.yaml &) +[ -f nohup.out ] || sleep 3 tail -f nohup.out popd |