openstack/octavia
Code Issues Proposed changes

Merge "Do not install pip in amphora when using distribution packages"

Browse Source
This commit is contained in:
Zuul 2018-02-26 12:04:49 +00:00 committed by Gerrit Code Review
commit 95c83e6462
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diskimage-create/diskimage-create.sh
View File

@ -128,7 +128,7 @@ while getopts "a:b:c:d:ehi:no:pt:r:s:vw:x" opt; do
AMP_OUTPUTFILENAME=$(readlink -f $OPTARG) AMP_OUTPUTFILENAME=$(readlink -f $OPTARG)
;; ;;
p) p)
export DIB_INSTALLTYPE_amphora_agent=package AMP_PACKAGE_INSTALL=1
;; ;;
r) r)
AMP_ROOTPW=$OPTARG AMP_ROOTPW=$OPTARG
@ -191,6 +191,8 @@ AMP_IMAGESIZE=${AMP_IMAGESIZE:-2}
AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0} AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0}
AMP_PACKAGE_INSTALL=${AMP_PACKAGE_INSTALL:-0}
AMP_ENABLE_FULL_MAC_SECURITY=${AMP_ENABLE_FULL_MAC_SECURITY:-0} AMP_ENABLE_FULL_MAC_SECURITY=${AMP_ENABLE_FULL_MAC_SECURITY:-0}
if [ "$AMP_BASEOS" = "rhel" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then if [ "$AMP_BASEOS" = "rhel" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then
@ -318,6 +320,12 @@ else
AMP_element_sequence="$AMP_element_sequence ${AMP_BASEOS}" AMP_element_sequence="$AMP_element_sequence ${AMP_BASEOS}"
fi fi
if [ "$AMP_PACKAGE_INSTALL" -eq 1 ]; then
export DIB_INSTALLTYPE_amphora_agent=package
else
# We will need pip for amphora-agent
AMP_element_sequence="$AMP_element_sequence pip-and-virtualenv"
fi
# Add our backend element (haproxy, etc.) # Add our backend element (haproxy, etc.)
AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND" AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND"

1
elements/amphora-agent/element-deps
View File

@ -1,6 +1,5 @@
dib-init-system dib-init-system
package-installs package-installs
pkg-map pkg-map
pip-and-virtualenv
source-repositories source-repositories
svc-map svc-map