openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "devstack: Remove q-lbaasv1 alias"

This commit is contained in:
Jenkins 2016-07-22 03:34:32 +00:00 committed by Gerrit Code Review
parent 2609073cde 32631f2587
commit 9b46045ff3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/README.md
View File

@ -46,9 +46,8 @@ To enable the LBaaS services, add lines in the form:
where
<LBAAS-FLAG> is "q-lbaasv1" for LBaaS Version 1, or "q-lbaasv2"
for LBaaS Version 2. "q-lbaas" is synonymous with
"q-lbaasv1".
<LBAAS-FLAG> is "q-lbaas" for LBaaS Version 1, or "q-lbaasv2"
for LBaaS Version 2.
<OCTAVIA-FLAGS> are "octavia" the Octavia driver,
"o-cw" the Octavia Controller Worker,
"o-hk" the Octavia housekeeping manager,

4
devstack/settings
View File

@ -1,12 +1,12 @@
# settings for LBaaS devstack pluginlib/neutron_plugins/services/loadbalancer
# For backward compatibility, treat q-lbaas and q-lbaasv1 the same.
# For backward compatibility, treat q-lbaas as lbaas v1.
# In the future, the q-lbaas may default to q-lbaasv2
AGENT_LBAASV1_BINARY="$NEUTRON_BIN_DIR/neutron-lbaas-agent"
AGENT_LBAASV2_BINARY="$NEUTRON_BIN_DIR/neutron-lbaasv2-agent"
LBAAS_V1="q-lbaas q-lbaasv1"
LBAAS_V1="q-lbaas"
LBAAS_V2="q-lbaasv2"
LBAAS_ANY="$LBAAS_V1 $LBAAS_V2"