openstack/octavia
Code Issues Proposed changes

Setup octavia for stable/pike

Browse Source 
Change-Id: I9c981848d5708c47434f29ceb68ad47a2dc4deaf
This commit is contained in:
Michael Johnson 2017-08-17 16:47:49 -07:00
parent 2c8cc57156
commit e4152755f3
2 changed files with 4 additions and 4 deletions
devstack
settings
elements/amphora-agent
source-repository-amphora-agent

4
devstack/settings

@ -3,7 +3,7 @@
OCTAVIA=${OCTAVIA:-"octavia"}
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-${GIT_BASE}/openstack/diskimage-builder.git}
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-stable/pike}
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
@ -73,7 +73,7 @@ OCTAVIA_API_HAPROXY="o-api-ha"
# Client settings
GITREPO["python-octaviaclient"]=${OCTAVIACLIENT_REPO:-${GIT_BASE}/openstack/python-octaviaclient.git}
GITBRANCH["python-octaviaclient"]=${OCTAVIACLIENT_BRANCH:-master}
GITBRANCH["python-octaviaclient"]=${OCTAVIACLIENT_BRANCH:-stable/pike}
GITDIR["python-octaviaclient"]=$DEST/python-octaviaclient
NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas

4
elements/amphora-agent/source-repository-amphora-agent

@ -1,3 +1,3 @@
# This is temporary until we have a pip package
amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia
upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia stable/pike
upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt stable/pike