85 Commits

Author SHA1 Message Date
bjorn lofdahl
281a8547b1 Fix neutron.conf.j2 metadata_workers spelling error
Change-Id: I8dbb25d643ab8da2b049f70d28bdd0839b9f2605
Closes-Bug: #1641591
(cherry picked from commit 2f0d4ccee32df4999e0b50a327a9df2c2ac55971)
2016-11-18 11:18:08 +08:00
Zhijiang Hu
803aaa6597 Uses tunnel_interface as ovs tunnel instead of api_interface
Closes-Bug: #1638242
Change-Id: Ib5192d1379457cd4292fc71dcbd62f78a02a1c07
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2016-11-06 22:06:42 -05:00
ZhongShengping
d7d2e0d09c deprecate external_network_bridge option in neutron
Option "external_network_bridge" from group "DEFAULT" is deprecated
for removal. Its value may be silently ignored in the future.

Change-Id: I2752fca275dd7b340c0ff97bfa3eecc0d3358e63
Closes-Bug: #1637808
2016-10-30 17:51:23 +08:00
Jeffrey Zhang
558d8ae998 Fix neutron upgrade permission issue
Change-Id: Id4e9d019ee5072b3a24e383174a2acfdb3ed984d
Partial-Bug: #1631503
2016-10-18 02:32:39 +00:00
Dave McCowan
cc2dde0854 OpenStack Services Should Use keystone_internal_url for auth
Horizon and Neutron mistakenly were using keystone_public_url
for authentication.  This works without error in deployments
when the internal services happen to have access to the
public network, but it is still wrong.  This fails to work
when the internal services can not access the public URLs,
for example when TLS is enabled on the public endppoints.

This patches corrects horizon and neutron to use
keystone_internal_url for auth.

Change-Id: I59b9094364bef375036028ba86a771dabf28c963
Closes-bug: #1625648
2016-10-15 18:50:41 -04:00
James McCarthy
cd968665eb Remove indentation from l3_agent.ini.j2
If enable_neutron_dvr is set, it leads to a failure of the
'Copying over l3_agent.ini' task due to parsing errors.

TrivialFix
Closes-bug: #1633488

Change-Id: Ia30970d65cf7b09fff336fe878d2be02e934b082
2016-10-14 15:05:45 +01:00
Jenkins
45f4540002 Merge "Fix template for multiple physical networks" 2016-10-13 17:01:17 +00:00
liyingjun
1706e17ae9 Fix template for multiple physical networks
This patch [1] adds support to config multiple physical networks for
ovs neutron plugin, but it missed to change ml2_conf.ini.j2
correspondingly.

[1]: https://review.openstack.org/#/c/373455/

Change-Id: I1937e1e5986657470add07d4bcf8587642aa45ec
Closes-bug: #1631903
2016-10-13 12:10:34 +00:00
Paul Bourke
cc0709792b Fix l3_agent.ini rendering error when DVR
The if/else blocks in this file cause a rendering error on control nodes
when enable_neutron_dvr: yes

ParsingError: File contains parsing errors: <???>
        [line  3]: u'    external_network_bridge =\n'

Change-Id: Ia461dcbbec531c4c6295b3c7e10da12c57b7d58b
Closes-Bug: 1626995
2016-10-04 16:22:31 +01:00
Christian Berendt
1116ae3f66 Add fwaas_driver.ini file to neutron-vpnaas-agent container
This solves the following issue:

oslo_config.cfg.ConfigFilesNotFoundError: Failed to find some config
files: /etc/neutron/fwaas_driver.ini

Change-Id: I606e591057574ca113f2cba18618f455f7c36bc6
Closes-bug: #1625672
2016-09-20 16:57:48 +02:00
Jenkins
ebcd7b2979 Merge "Remove duplicate lbaas provider config" 2016-09-19 13:48:18 +00:00
liyingjun
1b04a23d95 Remove duplicate lbaas provider config
Option `service_provider` is defined in neutron_lbaas.conf, there
is a duplicated config option in neutron.conf, it should be removed
there. Otherwise neutron-server will not be able to start with error:
'Invalid: Driver
neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver is
not unique across providers'

Change-Id: I3fc379535eb00bbcb23aa41de95ca8161883a181
Closes-bug: #1625174
2016-09-19 12:50:14 +00:00
liyingjun
0a024d9d7a Fix vpnaas for neutron
1. Install the missing vpnaas python module in neutron-server Dockerfile
2. Remove duplicated neutron-lbaas-common package from neutron-server,
since it is installed in neutron-base
3. Fix service plugin config, it's not vpn`ass` ;)) 'vpnass' ->
'neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin' [1]

[1]:
https://github.com/openstack/neutron-vpnaas/blob/stable/newton/devstack/settings#L8

Change-Id: I5250b6875d96ef5df9cf39bce10ce072982aa80d
Closes-bug: #1625020
2016-09-19 07:19:00 +00:00
Christian Berendt
be0fcb5b99 Integrate neutron-vpnaas-agent into the neutron Ansible role
Implements: blueprint neutron-vpnaas-agent
Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>
Change-Id: I1fae21f48d5beef47934aef7c23910536955f2b8
2016-09-15 05:07:46 +00:00
Jenkins
37ec5ecb52 Merge "Add Networking-SFC role" 2016-09-14 20:03:12 +00:00
Paul Bourke
95c916aa5e Allow Neutron to be run in DVR mode
Introduces a new property "enable_neutron_dvr", along with the
appropriate service and template changes to allow DVR.

Closes-Bug: #1623463
DocImpact: dvr changes network data paths and adds requirements for NICs
Co-Authored-By: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Change-Id: I87a26e9258228ae2ccb76be1e5f0bb44fac128df
2016-09-14 12:58:47 +01:00
prithiv
8a01ed3270 Add Networking-SFC role
Networking-SFC is a neutron big-tent project support Service Function
Chaining in Neutron.

* Rename the image from neutron-networking-sfc-agent to
  neutron-sfc-agent.
* Add networking-sfc role in playbooks.

Co-Authored-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: I1f99650eed85f59929d4ab6b2226603c54f29577
Implements: blueprint enable-networking-sfc-support
2016-09-14 15:41:03 +08:00
Kevin Fox
5e3f392d5b Fix transport for kolla-kubernetes
TrivialFix

Change-Id: I1b6aafaa462b9585f351b627277aa1f2c516bfa2
2016-09-13 22:10:04 +00:00
Serguei Bezverkhi
134089d6cd Adding required check for Orchestration Kubernetes
Thgis PS add missing check for Kubernetes orchestration engine,
without these changes, running kolla-ansible genconfig fails
for Kubernetes environment.

TrivialFix

Change-Id: I25eeb7ae3ddba7c924f6d48aa24afdbe74227170
2016-09-12 15:32:42 -04:00
Christian Berendt
4bdf43c34d Move transport_url parameter before service_providers section
TrivialFix

Change-Id: I3ab030e4723afb032011b7aacf4b909764e954f0
2016-09-09 13:39:13 +02:00
Jenkins
8c2bbae69e Merge "Move to transport_url for rabbitmq configuration" 2016-09-02 09:22:12 +00:00
liyingjun
c5668bd50a Add option to support dhcp/l3 agent ha
New option enable_neutron_agent_ha added to enable/disable dhcp/l3 agent
high availability, dhcp_agents_per_network is default to 2 and it's
configurable.

Implement blueprint: support-network-ha

Change-Id: Id4742aa67c80584634b923195545bf2b654172f3
2016-08-31 16:31:07 +08:00
Jeffrey Zhang
d255743601
Move to transport_url for rabbitmq configuration
rabbit_hosts, rabbit_userid and rabbit_password are deprecated for
removal.[0]

rpc_backend is deprecated for removal.[1]

rabbit_ha_queues is deprecated. it is useless when using RabbitMQ >= 3.0
[2]

[0] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
[2] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Closes-Bug: #1614082
Change-Id: I05d318ba6c11c5dbfa9fbf67d088a43ab465be30
2016-08-25 16:07:42 +08:00
Serguei Bezverkhi
4d6afc67be Start using orchestration_engine variable
This PS switches to use orchestration_engine variable to differentiate
between ansible and kubernetes when generating configs.

TrivialFix

Change-Id: I8e566a9995f49e924614331458d0c81b9925e543
2016-08-17 16:38:31 -04:00
Jenkins
ec569e752d Merge "Fix the neutron-lbaas-agent container issues" 2016-08-15 15:53:34 +00:00
Ken Wronkiewicz
99a1662f61 Fix interface address for Neutron-server
Note: This should not result in any behavior changes in regular Kolla, just Kolla-Kubernetes and only when you've overridden stuff in globals.yml

Binds to the api_interface_address variable and uses the keystone and memcached facts we defined in earlier patches.

Co-authored-by: Ryan Hallisey <rhallise@redhat.com>
Change-Id: I8610f4adaa557a21fedd05601e10f5c308fd7ce3
Partially-implements: blueprint api-interface-bind-address-override
2016-08-11 05:33:32 -04:00
Jenkins
00c6fa87f7 Merge "Introduce a script to launch ovsdb-server process" 2016-08-10 02:17:55 +00:00
Serguei Bezverkhi
41ec75b567 Introduce a script to launch ovsdb-server process
The reason for introducing this script is to be able
to launch ovsdb-server and initialize it (create external bridge and plug
external interface) in one shot. It is applicable ONLY to Kubernetes environment
and it is required for Kubernetes DaemonSet usage. The behavior in classical
Kolla has not been changed.

TrivialFix

Change-Id: I54897cc2c0f2bcaaf0411822f3409bf96e92833d
2016-08-09 19:03:20 -04:00
Jenkins
4b735e2bf2 Merge "Make the enable_isolated_metadata and force_metadata to yes in default" 2016-08-09 04:29:08 +00:00
liyingjun
fc97ff1021 Change config for lbaas service_plugins
Lbaasv2 is used by default, we should change service_plugins for lbaas
from 'lbaas' to
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
as suggested in networking-guide:
http://docs.openstack.org/mitaka/networking-guide/adv-config-lbaas.html#configuring-lbaas-v2-with-an-agent

Change-Id: I49a24500403bd2717fcad49742830c6ceaaf210b
Closes-bug: #1608344
2016-08-01 11:48:01 +08:00
Jenkins
c895034030 Merge "Use lbaas alias instead of the class name" 2016-07-28 11:38:27 +00:00
Jeffrey Zhang
3c3b0288b4 Use a lower number of the workers
Use a lower number of workers rather than the default value, which is
equal to the number of the cpu. Otherwise, in a multi cpu environment,
the number of the processes will very high.

In this PS, we use min(5, << number of cpu >>) as the default worker
count.

Closes-Bug: #1582254
Change-Id: I1c32cf0db794b43b8fb8be18f39190422ca5846f
2016-07-27 16:36:25 +08:00
Jeffrey Zhang
512be70cee Fix the neutron-lbaas-agent container issues
* copy the ml2_conf.ini file to the container
* map the host /etc/localtime file to the container
* remove the output_file and wrap_with options in the lbaas_agent.ini
  file, which are useless
* remove the interface_driver in the lbaas_agent, which is configured
  in the neutron.conf file
* install net-tools package into the container, which is used by the
  neutron-lbaas

Change-Id: Ia58d825e41d3b843d8c6e6b3c9ee1756c1aed1ac
Closes-Bug: #1606755
2016-07-27 11:42:34 +08:00
Jeffrey Zhang
615b0ecb19 Make the enable_isolated_metadata and force_metadata to yes in default
The cloud-init will not work when those two value are no in a
none router environment

Closes-Bug: #1606756
Change-Id: I2436a8a512b3190605ba97c22b350ea0478b7a84
2016-07-27 03:28:15 +00:00
Jeffrey Zhang
ba42fb6836 Use lbaas alias instead of the class name
Plugin alias is recommended to use.

TrivialFix

Change-Id: I2b8cb9a8e70e6310000bf6b9ad731f85cbf9e04b
2016-07-22 12:10:32 +08:00
Dennis Mueller
76f0f9ae27 Added ceilometer decision in neutron.conf for event notifications
Changes the oslo_messaging_notifications driver of neutron if
ceilometer is enabled

Change-Id: I16667ceb6fe75aff7f324d342e5075e1b028c70e
Closes-Bug: 1604793
2016-07-20 13:58:42 +02:00
Jeffrey Zhang
10258f138b Fix the native ovsdb_interace failed
Closes-Bug: #1598977
Change-Id: I8be53531c2ba000c3b73d0f957dcc50fe947c925
2016-07-05 09:02:06 +08:00
Jenkins
8f5747318b Merge "Enable openvswitch container logs in host volumes" 2016-06-27 17:06:35 +00:00
Hui Kang
54919dc498 Enable openvswitch container logs in host volumes
Allow heka container to pick up the openvswitch logs like other
services

Change-Id: I396ae9419540070c6ab01b8f62607ab46b1f08aa
closes-Bug: #1573199
2016-06-26 23:45:33 -04:00
Christian Berendt
a7f93b09bb Make Neutron QoS service plugin configurable
This introduces a new configuration parameter neutron_enable_qos to
be able to enable the Neutron QoS service plugin.

More details about the Neutron QoS service plugin are available at:

http://docs.openstack.org/liberty/networking-guide/adv-config-qos.html

Change-Id: I8525bf4dce5f1e225f72a4e1c3760b64a36b17f6
Closes-bug: #1593183
Implements: bp netowrking-qos
2016-06-18 15:53:12 +00:00
Christian Berendt
8acc1771fb Remove verbose parameter from lbaas_agent.ini file
The verbose parameter is deprecated and should not be used. This
solves the following issue:

Option "verbose" from group "DEFAULT" is deprecated for removal.
Its value may be silently ignored in the future

TrivialFix

Change-Id: Ifb04c3f396a96b6917637af3a90a3ddb1599e29d
2016-06-14 15:53:23 +02:00
Daneyon Hansen
ba30579b3b Adds Neutron LBaaS Support
Previously, kolla did not support neutron lbaas functionality.
Only Lbaasv2 is supported in Mitaka. Additional information can
be found here:
http://docs.openstack.org/mitaka/networking-guide/adv-config-lbaas.html
Magnum uses Neutron Lbaas to provide high availability to COE API
and Etcd endpoints within a bay. Therefore, Neutron Lbaas is required
for Kolla to support Magnum.

Co-Authored-By: Serguei Bezverkhi <sbezverk@cisco.com>
Partial-Bug: #1551992

Change-Id: I05360b7c447c601fcb3c2b6b2a913ef5cc0f3a1b
2016-05-27 11:41:25 -04:00
Ihar Hrachyshka
a627681eec Stop configuring neutron to enforce DHCP MTU option
Since Mitaka, Neutron does the right job to calculate and advertise
correct MTU to instances, out of the box [1].

[1] https://review.openstack.org/#/c/302165/

TrivialFix
Change-Id: I71a6dc5b56c2c1fb9db757df77a56feababdc039
2016-05-17 15:54:49 +00:00
Ryan Hallisey
67333e4dd1 Set db connection retry to infinity
Make sure that all the sevices will attempt to
connect to the database an infinite about of times.
If the database ever disappears for some reason we
want the services to try and reconnect more than just
10 times.

Closes-bug: #1505636
Change-Id: I77abbf72ce5bfd68faa451bb9a72bd2544963f4b
2016-04-11 07:22:09 -04:00
Dave McCowan
afc2bd83dc Configure Neutron to use internalURL for contacting Nova
The Kolla design is for services to use the internalURL for
service to service communication.  In Mitaka, Neutron added
a new config parameter specifying which URL to use to to
contact Nova, making the default 'public'.  This patch sets
the value to 'internal'.

Change-Id: I2d36f3b4a860af9e9034ebfb2b5cea56450e5e4e
Closes-Bug: #1565624
2016-04-07 06:39:00 +00:00
SamYaple
b188d3abe5 Re-set external_network_bridge for l3 agent
Without this option set to blank neutron will attempt to dump raw
frames which is not correct. Kevin Benton is working on fixing the
deprecation message.

Change-Id: Ib6d6f41e2f222d383583e79958a78f2a09d3ae93
Closes-Bug: #1561156
2016-03-23 19:02:31 +00:00
SamYaple
56fd071bcb Change deprecated options throughout Kolla
These options have all be deprecated/removed. This switches all
options to thier proper mitaka values.

TrivialFix
Change-Id: Ica8d5ea0d48da01ee11672a32890431acd6a306d
2016-03-19 23:55:05 +00:00
SamYaple
d4535b6dc3 Add memcached_servers to keystone_auth section
The in-process cache for keystone tokens has been deprecated due to
"incosistent results and high memory usage" with the expectation we
switch to memcached_servers if we want to stay performant.

Add memcache_servers [cache] section to the appropriate servers as the
[DEFAULT]\memcache_servers options was deprecated.

TrivialFix
Related-Id: Ied2b88c8cefe5655a88d0c2f334de04e588fa75a

Change-Id: Ic971bdddc0be3338b15924f7cc0f97d4a3ad2440
2016-03-19 21:53:03 +00:00
Dave McCowan
1c31951b85 Use internalURL for internal communication
When using separate networks for external APIs and internal
APIs, services need to be configured to use the internal APIs.
The default is typically publicURL.

TrivialFix

Change-Id: I24da63220a65e210c37d9f24b6d76a0031d66f3d
2016-03-07 09:28:48 -05:00
Jenkins
0c7cf6fdc4 Merge "Modify a hard-code keystone username in neutron and heat." 2016-02-28 18:52:49 +00:00