summaryrefslogtreecommitdiff
path: root/elements/os-cloud-config
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-01-05 12:38:44 -0500
committerJames Slagle <jslagle@redhat.com>2016-01-05 12:38:44 -0500
commit787b70b77263583728199c858226a6d51c6409fc (patch)
tree84d533347cea83fb3478cfb4b0a5774063225b21 /elements/os-cloud-config
parente6720d3d9fa4c026871b62be0f14bb326d6a993d (diff)
Don't set default install type for os-cloud-config to pip
When this element was first added, pip was set as the default install type. This is not ideal since it means that $DIB_DEFAULT_INSTALL_TYPE is not honored when using this element, you'd have to explicitly know that you also need to set $DIB_INSTALLTYPE_os_cloud_config. This patch removes the settings of $DIB_INSTALLTYPE_os_cloud_config so that $DIB_DEFAULT_INSTALL_TYPE is honored. Change-Id: I8f47b495218a72f5a78d68b7c2610116a5b4984c
Notes
Notes (review): Code-Review+2: Ben Nemec <openstack@nemebean.com> Code-Review+2: John Trowbridge <trown@redhat.com> Code-Review+2: Juan Antonio Osorio Robles <jaosorior@redhat.com> Workflow+1: Juan Antonio Osorio Robles <jaosorior@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 19 Apr 2016 06:52:14 +0000 Reviewed-on: https://review.openstack.org/263828 Project: openstack/tripleo-image-elements Branch: refs/heads/master
Diffstat (limited to 'elements/os-cloud-config')
-rw-r--r--elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash2
1 files changed, 0 insertions, 2 deletions
diff --git a/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash b/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash
index de0e244..4800f5b 100644
--- a/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash
+++ b/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash
@@ -1,7 +1,5 @@
1#!/bin/bash 1#!/bin/bash
2 2
3export DIB_INSTALLTYPE_os_cloud_config="${DIB_INSTALLTYPE_os_cloud_config:-"pip"}"
4
5if [ -z "${OS_CLOUD_CONFIG_VENV_DIR:-}" ]; then 3if [ -z "${OS_CLOUD_CONFIG_VENV_DIR:-}" ]; then
6 export OS_CLOUD_CONFIG_VENV_DIR="${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/os-cloud-config"}" 4 export OS_CLOUD_CONFIG_VENV_DIR="${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/os-cloud-config"}"
7fi 5fi