summaryrefslogtreecommitdiffstats
path: root/build/instack.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-10-19 14:07:43 -0400
committerDan Radez <dradez@redhat.com>2015-10-20 20:54:10 -0400
commit62780f5aa094a2991a9f82c6128458c9d92908bd (patch)
tree7026b9e50b24c9fb6780ab17aba461e1e4cc475b /build/instack.sh
parentcd82c363e5818a884e76ed3803d82e42a5ab2cff (diff)
updating repos, liberty is becoming stable
Change-Id: I6564c384db33a18f851dc35de6e1cb52e919753d Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/instack.sh')
-rwxr-xr-xbuild/instack.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 24abb1a..0cc0958 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -5,6 +5,13 @@ declare -i CNT
RDO_RELEASE=kilo
SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null)
+# check for dependancy packages
+for i in libguestfs-tools; do
+ if ! rpm -q $i > /dev/null; then
+ sudo yum install -y $i
+ fi
+done
+
# RDO Manager expects a stack user to exist, this checks for one
# and creates it if you are root
if ! id stack > /dev/null; then
@@ -47,14 +54,14 @@ elif [ "$1" == "-master" ]; then
sudo yum -y install yum-plugin-priorities
sudo yum-config-manager --disable openstack-${RDO_RELEASE}
sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/delorean.repo
- sudo curl -o /etc/yum.repos.d/delorean-current.repo http://trunk.rdoproject.org/centos7-liberty/current/delorean.repo
- sudo sed -i 's/\[delorean\]/\[delorean-current\]/' /etc/yum.repos.d/delorean-current.repo
sudo curl -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
+ sudo rm -f /etc/yum.repos.d/delorean-current.repo
+
fi
# ensure the undercloud package is installed so we can build the undercloud
if ! rpm -q instack-undercloud > /dev/null; then
- sudo yum install -y instack-undercloud
+ sudo yum install -y python-tripleoclient
fi
# ensure openvswitch is installed
@@ -107,9 +114,6 @@ fi
yum -y install yum-plugin-priorities
curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/delorean.repo
-curl -o /etc/yum.repos.d/delorean-current.repo http://trunk.rdoproject.org/centos7-liberty/current/delorean.repo
-sed -i 's/\\[delorean\\]/\\[delorean-current\\]/' /etc/yum.repos.d/delorean-current.repo
-echo $'\nincludepkgs=diskimage-builder,openstack-heat,instack,instack-undercloud,openstack-ironic,openstack-ironic-inspector,os-cloud-config,python-ironic-inspector-client,python-tripleoclient,tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo-puppet-elements,openstack-tuskar-ui-extras,openstack-puppet-modules' >> /etc/yum.repos.d/delorean-current.repo
curl -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
yum install -y python-tripleoclient
cp /root/.ssh/authorized_keys /home/stack/.ssh/authorized_keys