Commit 560cdb26 authored by David Johnson's avatar David Johnson

Make Neutron lbaas support conditional and default to off.

parent 6cfb0033
......@@ -181,6 +181,10 @@ pc.defineParameter("enableInboundSshAndIcmp","Enable Inbound SSH and ICMP",
portal.ParameterType.BOOLEAN,True,advanced=True,
longDescription="Enable inbound SSH and ICMP into your instances in the default security group, if you have security groups enabled.")
pc.defineParameter("enableNeutronLoadBalancing","Enable Neutron LBaaS",
portal.ParameterType.BOOLEAN,False,advanced=True,
longDescription="Enable Neutron LBaas for releases >= Newton.")
pc.defineParameter("enableNewSerialSupport","Enable new Juno serial consoles",
portal.ParameterType.BOOLEAN,False,advanced=True,
longDescription="Enable new serial console support added in Juno. This means you can access serial consoles via web sockets from a CLI tool (not in the dashboard yet), but the serial console log will no longer be available for viewing! Until it supports both interactivity and logging, you will have to choose. We download software for you and create a simple frontend script on your controller node, /root/setup/novaconsole.sh , that when given the name of an instance as its sole argument, will connect you to its serial console. The escape sequence is ~. (tilde,period), but make sure to use multiple tildes to escape through your ssh connection(s), so that those are not disconnected along with your console session.")
......@@ -971,6 +975,9 @@ class Parameters(RSpec.Resource):
param = ET.SubElement(el,paramXML)
param.text = "DEFAULT_SECGROUP_ENABLE_SSH_ICMP=%d" % (int(params.enableInboundSshAndIcmp))
param = ET.SubElement(el,paramXML)
param.text = "USE_NEUTRON_LBAAS=%d" % (int(params.enableNeutronLoadBalancing))
param = ET.SubElement(el,paramXML)
param.text = "CEILOMETER_USE_MONGODB=%d" % (int(params.ceilometerUseMongoDB))
......
......@@ -1347,7 +1347,10 @@ if [ -z "${NEUTRON_DBPASS}" ]; then
fi
fi
maybe_install_packages neutron-server neutron-plugin-ml2 python-neutron-lbaas python-neutronclient
maybe_install_packages neutron-server neutron-plugin-ml2 python-neutronclient
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
maybe_install_packages python-neutron-lbaas
fi
#
# Install a patch to make manual router interfaces less likely to hijack
......@@ -1371,9 +1374,12 @@ if [ -z "${NEUTRON_DBPASS}" ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT core_plugin ml2
if [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins 'router,metering'
else
elif [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
else
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering'
fi
crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips True
......@@ -1528,7 +1534,7 @@ EOF
firewall_driver $fwdriver
fi
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/neutron/neutron_lbaas.conf service_providers \
service_provider "LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"
fi
......@@ -1603,7 +1609,7 @@ EOF
# Install the neutron lbaas dashboard panel, and update the neutron
# db for lbaas.
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
git clone https://git.openstack.org/openstack/neutron-lbaas-dashboard
cd neutron-lbaas-dashboard
git checkout stable/${OSRELEASE}
......
......@@ -117,6 +117,8 @@ LINUXBRIDGE_STATIC=0
# control net DNS server). The local domain will also be searched prior
# to the cluster's domain.
USE_DESIGNATE_AS_RESOLVER=1
# If set to 1, and if OSRELEASE >= OSNEWTON, then setup Neutron LBaaS.
USE_NEUTRON_LBAAS=0
# We are not currently using the ceilometer stats, and they do not work
# as of Pike due to the switch to Gnocchi as the measurement DB.
ENABLE_OPENSTACK_SLOTHD=0
......
......@@ -55,8 +55,13 @@ crudini --set /etc/neutron/neutron.conf DEFAULT auth_strategy keystone
crudini --set /etc/neutron/neutron.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT debug ${DEBUG_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT core_plugin ml2
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
else
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering'
fi
crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips True
crudini --set /etc/neutron/neutron.conf DEFAULT notification_driver messagingv2
......
......@@ -55,8 +55,13 @@ crudini --set /etc/neutron/neutron.conf DEFAULT auth_strategy keystone
crudini --set /etc/neutron/neutron.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT debug ${DEBUG_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT core_plugin ml2
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
else
crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \
'router,metering'
fi
crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips True
crudini --set /etc/neutron/neutron.conf DEFAULT notification_driver messagingv2
......
......@@ -53,7 +53,7 @@ EOF
sysctl -p
maybe_install_packages neutron-l3-agent neutron-dhcp-agent neutron-metering-agent
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
maybe_install_packages neutron-lbaasv2-agent
fi
......@@ -161,7 +161,7 @@ crudini --set /etc/neutron/metering_agent.ini DEFAULT \
crudini --set /etc/neutron/metering_agent.ini DEFAULT \
use_namespaces True
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/neutron/lbaas_agent.ini DEFAULT \
device_driver "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
if [ "${ML2PLUGIN}" = "linuxbridge" ]; then
......@@ -186,7 +186,7 @@ service_restart neutron-metadata-agent
service_enable neutron-metadata-agent
service_restart neutron-metering-agent
service_enable neutron-metering-agent
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $USE_NEUTRON_LBAAS -eq 1 -a $OSVERSION -ge $OSNEWTON ]; then
service_restart neutron-lbaasv2-agent
service_enable neutron-lbaasv2-agent
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment