Merge "Fix Neutron lbaas and add it to scenario002"
This commit is contained in:
commit
79f01347e5
|
@ -191,6 +191,7 @@ This is the current matrix of available tests:
|
||||||
| glance | file | swift | file |
|
| glance | file | swift | file |
|
||||||
| nova | X | X | X |
|
| nova | X | X | X |
|
||||||
| neutron | X | X | X |
|
| neutron | X | X | X |
|
||||||
|
| lbaasv2 | | X | |
|
||||||
| cinder | X | | |
|
| cinder | X | | |
|
||||||
| ceilometer | | | X |
|
| ceilometer | | | X |
|
||||||
| aodh | | | X |
|
| aodh | | | X |
|
||||||
|
|
|
@ -600,10 +600,8 @@ def create_manifests(config, messages):
|
||||||
service_plugins = []
|
service_plugins = []
|
||||||
service_providers = []
|
service_providers = []
|
||||||
if config['CONFIG_LBAAS_INSTALL'] == 'y':
|
if config['CONFIG_LBAAS_INSTALL'] == 'y':
|
||||||
lbaas_sp = ('LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.'
|
lbaas_sp = ('LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.'
|
||||||
'drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'
|
'plugin_driver.HaproxyOnHostPluginDriver')
|
||||||
':default')
|
|
||||||
service_plugins.append('lbaas')
|
|
||||||
service_providers.append(lbaas_sp)
|
service_providers.append(lbaas_sp)
|
||||||
|
|
||||||
# ML2 uses the L3 Router service plugin to implement l3 agent
|
# ML2 uses the L3 Router service plugin to implement l3 agent
|
||||||
|
|
|
@ -9,7 +9,6 @@ class packstack::neutron::api ()
|
||||||
$neutron_sql_connection = "mysql+pymysql://${neutron_db_user}:${neutron_db_password}@${neutron_db_host}/${neutron_db_name}"
|
$neutron_sql_connection = "mysql+pymysql://${neutron_db_user}:${neutron_db_password}@${neutron_db_host}/${neutron_db_name}"
|
||||||
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
|
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
|
||||||
$neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
|
$neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
|
||||||
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
|
|
||||||
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { '::neutron::server':
|
||||||
|
@ -24,7 +23,6 @@ class packstack::neutron::api ()
|
||||||
service_providers => hiera_array('SERVICE_PROVIDERS'),
|
service_providers => hiera_array('SERVICE_PROVIDERS'),
|
||||||
ensure_fwaas_package => $neutron_fwaas_enabled,
|
ensure_fwaas_package => $neutron_fwaas_enabled,
|
||||||
ensure_vpnaas_package => $neutron_vpnaas_enabled,
|
ensure_vpnaas_package => $neutron_vpnaas_enabled,
|
||||||
ensure_lbaas_package => $neutron_lbaas_enabled,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/neutron/api-paste.ini':
|
file { '/etc/neutron/api-paste.ini':
|
||||||
|
|
|
@ -2,7 +2,7 @@ class packstack::neutron::lbaas ()
|
||||||
{
|
{
|
||||||
class { '::neutron::agents::lbaas':
|
class { '::neutron::agents::lbaas':
|
||||||
interface_driver => hiera('CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'),
|
interface_driver => hiera('CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'),
|
||||||
device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
device_driver => 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||||
user_group => 'haproxy',
|
user_group => 'haproxy',
|
||||||
enable_v1 => false,
|
enable_v1 => false,
|
||||||
enable_v2 => true,
|
enable_v2 => true,
|
||||||
|
@ -10,6 +10,6 @@ class packstack::neutron::lbaas ()
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'::neutron::services::lbaas':
|
class {'::neutron::services::lbaas':
|
||||||
service_providers => 'LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
|
service_providers => 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ echo -e "Generating packstack config for:
|
||||||
- glance (swift backend)
|
- glance (swift backend)
|
||||||
- nova
|
- nova
|
||||||
- neutron (ovs+vxlan)
|
- neutron (ovs+vxlan)
|
||||||
|
- lbaasv2
|
||||||
- swift
|
- swift
|
||||||
- sahara
|
- sahara
|
||||||
- trove
|
- trove
|
||||||
|
@ -26,6 +27,7 @@ $SUDO packstack --allinone \
|
||||||
--os-horizon-install=n \
|
--os-horizon-install=n \
|
||||||
--nagios-install=n \
|
--nagios-install=n \
|
||||||
--glance-backend=swift \
|
--glance-backend=swift \
|
||||||
|
--os-neutron-lbaas-install=y \
|
||||||
--os-sahara-install=y \
|
--os-sahara-install=y \
|
||||||
--os-trove-install=y \
|
--os-trove-install=y \
|
||||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
||||||
|
|
Loading…
Reference in New Issue