Only enable nodepool precise-backports on Ubuntu

In preparation for using Fedora with this script, only try to add
the precise-backports repo if we're using Ubuntu.

Fedora 20 has jq in the regular repos, so no Fedora version is
required.

Also fix permissions on install_devstack_dependencies.sh

Change-Id: I3544ddecb0e3ba9dc863f264d67669acd06616f3
This commit is contained in:
Elizabeth Krumbach Joseph 2014-03-20 13:34:37 -07:00
parent d9b7c218a6
commit 9c2d202a18
2 changed files with 5 additions and 2 deletions

View File

@ -18,8 +18,11 @@
# limitations under the License.
# Enable precise-backports so we can install jq
sudo sed -i -e 's/# \(deb .*precise-backports main \)/\1/g' /etc/apt/sources.list
sudo apt-get update
if [ -f /usr/bin/apt-get ]; then
sudo sed -i -e 's/# \(deb .*precise-backports main \)/\1/g' \
/etc/apt/sources.list
sudo apt-get update
fi
./install_devstack_dependencies.sh