1407 Commits

Author SHA1 Message Date
Paul Bourke
d1673ad173 Allow operators to provision multiple physical networks
Currently Kolla operators are restricted to configuring one physical
network (physnet1).

This change along with ml2_conf.ini augmentation can be used to setup
multiple physical networks in openvswitch.

E.g. To configure two physical networks, physnet1 and physnet2, with
ports eth1 and eth2 associated respectively:

In /etc/kolla/globals.yml, set

neutron_bridge_name: "br-ex,br-ex2"
neutron_external_interface: "eth1,eth2"

In /etc/kolla/config/neutron/ml2_conf.ini

[ovs]
bridge_mappings = physnet1:br-ex,physnet2:br-ex2

Co-Authored-By: Mick Thompson <michael.a.thompson@oracle.com>
Closes-Bug: #1625700
DocImpact

Change-Id: I9454ca98d9b058368129123109ccc56f95519874
2016-09-21 09:14:47 +00:00
Jenkins
f6b03676db Merge "run_once Checking mongodb backend for ceilometer" 2016-09-20 12:26:51 +00:00
Jenkins
ee7ce6eebd Merge "Deprecate old auth parameters of ironic in nova.conf" 2016-09-20 12:26:44 +00:00
Jenkins
aa378bfa3a Merge "fix horizon fernet container" 2016-09-20 12:26:37 +00:00
Jenkins
a5527505c8 Merge "Fix Keystone CADF notifications" 2016-09-20 12:26:26 +00:00
Jenkins
b7ea5ed91e Merge "Allow genconfig to work with kolla-kubernetes and ceph" 2016-09-20 12:17:45 +00:00
Jenkins
00d0e1bc39 Merge "Set ownership of barbican configuration files to barbican" 2016-09-20 09:48:26 +00:00
Jenkins
b74c8d19d4 Merge "Repair swift reconfiguration" 2016-09-20 09:47:37 +00:00
ZhongShengping
2042ad2850 Deprecate old auth parameters of ironic in nova.conf
The auth parameters `admin_username`, `admin_password`,
`admin_tenant_name` and `admin_url` of the [ironic] config
option group are now deprecated and will be removed in a
future release. Using these parameters will log a warning.
Please use `username`, `password`, `project_name `and
`auth_url` instead.

Change-Id: I9e383788e35b83888b3b5cf927f67b0f3b4ef54b
Closes-Bug: 1619266
2016-09-20 08:44:23 +08:00
Kevin Fox
08146dc3b6 Allow genconfig to work with kolla-kubernetes and ceph
TrivialFix

Change-Id: If3b975710425a88f5cc8df016a009e5e5b413ca5
2016-09-19 17:02:24 -07:00
Kevin Fox
ea0e8546ae Fix Keystone CADF notifications
* use template for transport_url that is working for kolla-kubernetes
* use transport_url parameter in DEFAULT section

Co-authored-by: Christian Berendt <berendt@betacloud-solutions.de>

Change-Id: I800b5bc4c178b5df4f208ee50944e2806fd6a7c1
Closes-bug: #1625352
2016-09-19 22:29:30 +02:00
Jeffrey Zhang
c3f2be5928 fix horizon fernet container
keystone-fernet container need keystone.conf file

TrivialFix

Change-Id: If4a75a4d9e88350963c31190bc09cee4862aa34d
2016-09-20 03:41:27 +08:00
Jeffrey Zhang
873551030a Add pulling ceilometer-collector image
TrivialFix

Change-Id: I72670b61c50ff30a6f9c17e99b60e4e99529c062
2016-09-20 03:34:56 +08:00
bjolo
c28a0cff7e run_once Checking mongodb backend for ceilometer
TrivialFix

Change-Id: I54151df7f869e0a7915ce6361eda8dfefe5d1870
2016-09-19 21:07:44 +02:00
Christian Berendt
6bc976aa07 Set ownership of barbican configuration files to barbican
Change-Id: I6fe7f0928812f816080ced76dec2659f2094276d
Closes-bug: #1625317
2016-09-19 20:58:06 +02:00
Jenkins
1863399686 Merge "Checking valid fernet expiry only need to run once" 2016-09-19 16:53:59 +00:00
Bartłomiej Daca
27621351ac Repair swift reconfiguration
Change the conditions order in when statement.

TrivialFix

Change-Id: Ied9907ff25b66de3fd43502a920a88af8ff0cacd
Closes-Bug: #1625256
2016-09-19 18:46:13 +02:00
bjolo
10bfda6240 Checking valid fernet expiry only need to run once
TrivialFix

Change-Id: I4e84ac4e51a976ad132aa78b175855bed1d4bb20
2016-09-19 15:21:57 +00:00
Jenkins
310180db04 Merge "Optimized the serial upgrade and reconfigure" 2016-09-19 15:16:13 +00:00
Jenkins
fc97971f40 Merge "fix config file permission to ironic instead of root" 2016-09-19 14:36:14 +00:00
Jenkins
33bdf93453 Merge "Enable CADF events in Keystone and introduce enable_cadf_notifications" 2016-09-19 14:23:14 +00:00
Jenkins
ebcd7b2979 Merge "Remove duplicate lbaas provider config" 2016-09-19 13:48:18 +00:00
Jenkins
bf9e95f317 Merge "Delete extra spaces in gnocchi config.yml" 2016-09-19 12:52:02 +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
caowei
8d2af5f05c Delete extra spaces in gnocchi config.yml
TrivialFix

Change-Id: Ie7bd9b104bd6ce542a365e949941e22eb2c85695
2016-09-19 18:22:36 +08:00
caoyuan
a95a037f44 Add "---" into ceilometer/tasks
TrivialFix

Change-Id: Ic822c205012161ce71b6104a39ce9b70d6a0fcea
2016-09-19 18:05:06 +08:00
Jenkins
25f2eb62f0 Merge "Fix vpnaas for neutron" 2016-09-19 08:45:13 +00:00
Jenkins
42358d359b Merge "Fix reconfiguration issue for Keystone role" 2016-09-19 08:23:36 +00:00
Jenkins
0ae470447d Merge "Add "---" into tempest.yml" 2016-09-19 07:23:00 +00:00
Jenkins
0ec9d4ab7d Merge "Fix up aodh config templates" 2016-09-19 07:20:49 +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
caoyuan
da4cf7be4a Add "---" into tempest.yml
TrivialFix

Change-Id: I1072b2a179e49628f47c4f0ef0c8eb42a970e8c9
2016-09-19 11:27:59 +08:00
Waldemar Znoinski
734f881c75 fix config file permission to ironic instead of root
Change-Id: I1ce97d18e45de19f88874894bdac588874aa6320
Closes-bug: #1613292
2016-09-18 09:25:15 +00:00
Jeffrey Zhang
e328ada3bd Optimized the serial upgrade and reconfigure
* add serial for reconfigure
* set playbook serial by using variable
* fix serial for barbican, influxdb and vmtp

Closes-Bug: #1624607
Change-Id: I66530c7736e1673a592eddbde75637825d12d9e2
2016-09-17 04:08:58 +00:00
Jeffrey Zhang
897fb08bac Fix reconfiguration issue for Keystone role
Closes-Bug: #1624598
Change-Id: If66d82c782e6c8255b94cb00cdf0893630db596c
2016-09-17 02:37:37 +00:00
Jenkins
d75847772d Merge "Cinder-backup fails while backing up iSCSI volumes" 2016-09-16 20:19:42 +00:00
Jenkins
ff14e6ec06 Merge "Correct Ironic keystone_authtoken option name" 2016-09-16 20:18:49 +00:00
Jenkins
74b75d8245 Merge "Fix ceilometer.conf template" 2016-09-16 16:20:13 +00:00
Paul Bourke
3b8209c982 Fix up aodh config templates
* The recently merged aodh role is trying to copy api_paste.ini on startup
which is already present at build time.

* memcache_servers was using incorrect for loop syntax

Note, the trim_blocks header is to solve the issue highlighted by
Jeffrey[0]

[0] http://lists.openstack.org/pipermail/openstack-dev/2016-September/103532.html

Change-Id: I8baa5446b3b6271d57d54c4c1663a338d8ab3cc8
Closes-Bug: #1624462
2016-09-16 16:48:02 +01:00
Steve Noyes
e1e8a5bac5 align ceph with other svc patterns in inventory files
The pattern is:

[service:children]
group
...
[service-subservice:children]
parent (or override)

TrivialFix

Change-Id: Iac91cf83f1d3df8a76460f51c3f2883e8c59df24
2016-09-16 15:07:41 +02:00
Christian Berendt
8f6bd4e735 Enable CADF events in Keystone and introduce enable_cadf_notifications
Change-Id: I0a40867ae65011fbfd53308b9d7f42d10435f5fa
Closes-bug: #1607905
2016-09-16 12:19:53 +00:00
Hui Kang
0d28b311eb Add Kuryr ansible role
Change-Id: I7134bffab940ee780e5f5010d639af56f97b41d6
Co-authored-by: Mohammad Banikazemi <mb@us.ibm.com>
Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>
Co-Authored-By: Antoni Segura Puimedon <antonisp@celebdor.com>
Partially-implements: bp kuryr-docker-plugin
2016-09-15 23:47:22 +00:00
Jenkins
97c99a9214 Merge "Add etcd ansible role" 2016-09-15 22:21:27 +00:00
Jenkins
ca623efa5b Merge "Integrate neutron-vpnaas-agent into the neutron Ansible role" 2016-09-15 21:11:57 +00:00
Jenkins
ec8ac5a689 Merge "Remove public_router_id from tempest configuration template" 2016-09-15 18:49:42 +00:00
Jenkins
4c0bf23aa9 Merge "Add cloudkitty to heka-openstack.toml.j2" 2016-09-15 15:46:29 +00:00
Jenkins
bac19675ed Merge "Generate full /etc/hosts on every node" 2016-09-15 14:40:52 +00:00
Christian Berendt
1be052390b Remove public_router_id from tempest configuration template
This parameter is usually not used and should not be provied in the
template.

TrivialFix

Change-Id: I4faea2127b741e06e327dd3e65387678d0bb0527
2016-09-15 15:28:56 +02:00
Christian Berendt
e771404bc5 Add cloudkitty to heka-openstack.toml.j2
TrivialFix

Change-Id: If995f08d5cc131498739afb48a2406438e806d2a
2016-09-15 12:06:51 +00:00
Christian Berendt
e3f4d45d3a User os_keystone_role to create cloudkitty rating role
TrivialFix

Change-Id: I11ac0ffb814f3b2a0c60daf93ed22746e4d399bf
2016-09-15 13:45:16 +02:00