From 2e1730b16fb690044fc85df98dfe37cd72b21819 Mon Sep 17 00:00:00 2001
From: Coleman Corrigan <coleman.corrigan@hp.com>
Date: Wed, 2 Apr 2014 18:14:07 +0100
Subject: [PATCH] Activate venvs in os-*-config elements source install

  This updates the source install scripts for os-apply collect and
  refresh config elements to activate their virtualenvs before
  performing pip installs,  as without this specifing a manifest for
  e.g. os-apply-config breaks devtest build

Closes-bug: #1305151
Change-Id: I3c42de180f76fb122637c801541f14e50169de89
---
 .../os-apply-config-source-install/10-os-config-applier    | 7 +++++++
 .../os-collect-config-source-install/10-os-collect-config  | 7 +++++++
 .../os-refresh-config-source-install/10-os-refresh-config  | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier
index 0a1068c19..acbb8cad1 100755
--- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier
+++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier
@@ -4,6 +4,9 @@ set -eux
 manifest=$(get-pip-manifest os-apply-config)
 
 virtualenv --setuptools /opt/stack/venvs/os-apply-config
+set +u
+source /opt/stack/venvs/os-apply-config/bin/activate
+set -u
 
 if [ -n "$manifest" ]; then
   use-pip-manifest $manifest
@@ -23,3 +26,7 @@ write-pip-manifest os-apply-config
 
 ln -s /opt/stack/venvs/os-apply-config/bin/os-apply-config /usr/local/bin/os-apply-config
 ln -s /opt/stack/venvs/os-apply-config/bin/os-config-applier /usr/local/bin/os-config-applier
+
+set +u
+deactivate
+set -u
diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
index 3ded73b35..14de2b074 100755
--- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
+++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
@@ -6,6 +6,9 @@ manifest=$(get-pip-manifest os-collect-config)
 install-packages build-essential libz-dev libxslt-dev libxml2-dev python-dev
 
 virtualenv --setuptools /opt/stack/venvs/os-collect-config
+set +u
+source /opt/stack/venvs/os-collect-config/bin/activate
+set -u
 
 if [ -n "$manifest" ]; then
   use-pip-manifest $manifest
@@ -60,3 +63,7 @@ else
     echo Only systems with systemd or upstart are supported.
     exit 1
 fi
+
+set +u
+deactivate
+set -u
diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
index 18c9f334f..a2cce35ae 100755
--- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
+++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
@@ -9,6 +9,9 @@ manifest=$(get-pip-manifest os-refresh-config)
 # pip and virtualenv is installed by the pip-and-virtualenv element
 
 virtualenv --setuptools /opt/stack/venvs/os-refresh-config
+set +u
+source /opt/stack/venvs/os-refresh-config/bin/activate
+set -u
 
 if [ -n "$manifest" ]; then
   use-pip-manifest $manifest
@@ -30,3 +33,7 @@ ln -s /opt/stack/venvs/os-refresh-config/bin/os-refresh-config /usr/local/bin/os
 for d in pre-configure.d configure.d migration.d post-configure.d; do
   install -m 0755 -o root -g root -d /opt/stack/os-config-refresh/$d
 done
+
+set +u
+deactivate
+set -u