openstack/tripleo-image-elements
Code Issues Proposed changes

Don't set default install type for os-cloud-config to pip

Browse Source 
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
This commit is contained in:
James Slagle 2016-01-05 12:38:44 -05:00
parent e6720d3d9f
commit 787b70b772
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash
View File

@ -1,7 +1,5 @@
#!/bin/bash
export DIB_INSTALLTYPE_os_cloud_config="${DIB_INSTALLTYPE_os_cloud_config:-"pip"}"
if [ -z "${OS_CLOUD_CONFIG_VENV_DIR:-}" ]; then
export OS_CLOUD_CONFIG_VENV_DIR="${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/os-cloud-config"}"
fi