From 9c2d202a18c52aecabbddb143e3ea85108838a8f Mon Sep 17 00:00:00 2001 From: Elizabeth Krumbach Joseph Date: Thu, 20 Mar 2014 13:34:37 -0700 Subject: [PATCH] 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 --- .../nodepool/scripts/install_devstack_dependencies.sh | 0 .../files/nodepool/scripts/prepare_tripleo.sh | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 modules/openstack_project/files/nodepool/scripts/install_devstack_dependencies.sh diff --git a/modules/openstack_project/files/nodepool/scripts/install_devstack_dependencies.sh b/modules/openstack_project/files/nodepool/scripts/install_devstack_dependencies.sh old mode 100644 new mode 100755 diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh index 56ed667d32..a8655e705e 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh @@ -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