Merge topics 'compute_count_fix', 'build_rewrite'

* changes:
  Allow 2+ compute node for none HA installs APEX-117
  updating vm creation for virt deployment

1 files changed, 57 insertions, 0 deletions

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
new file mode 100755
index 00000000..7e6c820c
--- /dev/null
+++ b/build/overcloud-opendaylight.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+set -e
+source ./variables.sh
+
+pushd images > /dev/null
+
+cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
+
+###############################################
+#####    Adding OpenDaylight to overcloud #####
+###############################################
+
+cat > /tmp/opendaylight.repo << EOF
+[opendaylight]
+name=OpenDaylight \$releasever - \$basearch
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-40-release/\$basearch/os/
+enabled=1
+gpgcheck=0
+EOF
+
+# install ODL packages
+# patch puppet-neutron: ODL Bug, Url check reports ODL is up but it's not quite up
+LIBGUESTFS_BACKEND=direct virt-customize \
+    --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
+    --install opendaylight,python-networking-odl \
+    --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
+    -a overcloud-full-opendaylight_build.qcow2
+
+# install Jolokia for ODL HA
+LIBGUESTFS_BACKEND=direct virt-customize \
+    --upload ${odl_artifacts_cache}/jolokia.tar.gz:/tmp/ \
+    --run-command "tar -xvf /tmp/jolokia.tar.gz -C /opt/opendaylight/system/org" \
+    -a overcloud-full-opendaylight_build.qcow2
+
+## WORK AROUND
+## when OpenDaylight lands in upstream RDO manager this can be removed
+
+# upload the opendaylight puppet module
+rm -rf puppet-opendaylight
+git clone -b opnfv_integration https://github.com/dfarrell07/puppet-opendaylight
+pushd puppet-opendaylight > /dev/null
+git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
+popd > /dev/null
+LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
+                                         --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
+                                         -a overcloud-full-opendaylight_build.qcow2
+
+mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
+popd > /dev/null