5126 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
d10015dbea Merge "Install cinder related package for glance" 2016-09-20 12:27:03 +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
Jenkins
af9ea973e8 Merge "Add pulling ceilometer-collector image" 2016-09-20 06:14:57 +00:00
Jenkins
e51c83f991 Merge "Install extra packages for gnocchi using setuptools extra feature" 2016-09-20 04:34:05 +00:00
Jenkins
55d4c5ff73 Merge "Fix using rhel as a base build image" 2016-09-20 04:28:10 +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
Andrew Widdersheim
ccc68d78e1 Update EPEL version in base
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL
builds to match what is happening in Oracle Linux. Seems as though HTTPS
does not work any longer.

TrivialFix

Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
2016-09-19 18:30:38 -04: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
Jenkins
041d5174ea Merge "Added enable_option for some services" 2016-09-19 16:50:04 +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
Andrew Widdersheim
879b446398 Fix using rhel as a base build image
Using rhel as a base build image is not a supported option. This seems
to have gotten lost during some code rearchitecture. Also, rename from
redhat to rhel to match the references in the documentation.

Closes-bug: #1625229

Change-Id: If950b20717205dd0e336e6171971e25a9d07df13
2016-09-19 11:18:16 -04:00
Jenkins
d694b57648 Merge "Remove the unnecessary space" 2016-09-19 15:16:20 +00:00
Jenkins
310180db04 Merge "Optimized the serial upgrade and reconfigure" 2016-09-19 15:16:13 +00:00
Jeffrey Zhang
d9c29c1d66 Install cinder related package for glance
This is needed by glance cinder storage[0].

[0] https://github.com/openstack/glance_store/blob/master/glance_store/_drivers/cinder.py

Change-Id: I6645239acb3fb300afde8cc5260c8935c387d06f
Closes-Bug: #1625226
2016-09-19 23:05:11 +08:00
Jenkins
fc97971f40 Merge "fix config file permission to ironic instead of root" 2016-09-19 14:36:14 +00:00
Jenkins
265a3cbfea Merge "Fix ironic Dockerfile" 2016-09-19 14:24:21 +00:00
Jenkins
33bdf93453 Merge "Enable CADF events in Keystone and introduce enable_cadf_notifications" 2016-09-19 14:23:14 +00:00
Jeffrey Zhang
a05a50e217 Install extra packages for gnocchi using setuptools extra feature
Change-Id: Id702e5e79958a764d827703e996927b161fb379e
Closes-Bug: #1625212
2016-09-19 22:20:16 +08: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
Jenkins
bcb87dd997 Merge "Add "---" into ceilometer/tasks" 2016-09-19 12:46:50 +00:00
Jenkins
09e7c2d7df Merge "corrected error in multinode.rst" 2016-09-19 12:09:24 +00:00
caowei
fec6382d2d Fix ironic Dockerfile
1.Change "ironic_base" to "ironic_inspector" in ironic-inspector Dockerfile
2.add {% block footer %}{% endblock %}
TrivialFix

Closes-Bug: #1625131
Change-Id: Ibd02676e91a9b00cb1a46e7d00eaa3ab2c6c6412
2016-09-19 19:10:51 +08:00
MD NADEEM
4e9d5b9234 Added Barbican in the list of services deployed by kolla
TrivialFix

Change-Id: Ia51d53e8c7c1c4ece7bb57dc4c68c962aa7257cc
2016-09-19 16:18:44 +05:30
MD NADEEM
aa5f743a8c Added enable_option for some services
TrivialFix

Change-Id: I0f881ea50378bea491bf9721359edc6b5428c28a
2016-09-19 16:06:14 +05:30
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
npraveen35
2d6a9ec6c1 corrected error in multinode.rst
Change-Id: If2aef9629dc7fb380358de8c32c46577b6054f1f
Closes-Bug:  #1624582
2016-09-17 17:02:33 +00:00