5096 Commits

Author SHA1 Message Date
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
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
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
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
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
c3048f54bd Merge "install ironic-inspector during image build" 2016-09-16 18:51:31 +00:00
Jenkins
74b75d8245 Merge "Fix ceilometer.conf template" 2016-09-16 16:20:13 +00:00
Jenkins
012a222a1b Merge "add reno note monitoring" 2016-09-16 16:10:48 +00:00
Jenkins
0ea70fa2f4 Merge "align ceph with other svc patterns in inventory files" 2016-09-16 16:08:30 +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
zhubingbing
76e38213ec add reno note monitoring
Change-Id: Ic3ff4ece57d6f69f3bf8a6375f0fb2e036fcc875
Co-Authored-By: Michal (inc0) Jastrzebski <inc007@gmail.com>
Closes-Bug: #1624417
2016-09-16 14:26:33 +00:00
Jenkins
82c1a3d645 Merge "Add networking guide for Neutron extensions" 2016-09-16 14:22:38 +00:00
Jenkins
be3d63dbfa Merge "Allow operators to customise keystone source install" 2016-09-16 14:20:44 +00:00
Waldemar Znoinski
6664a8d31d install ironic-inspector during image build
Add installation of ironic-inspector package
on binary ubuntu or via pip on any source type of installations.

Change-Id: I5946369b6424c32e0cbf00a6590d41eb85b1de18
Closes-bug: #1565936
2016-09-16 14:03:41 +00: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
Jenkins
f9956f2e10 Merge "Modify collectd permissions" 2016-09-16 12:50:23 +00: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
Jenkins
112974b052 Merge "Update "which" command to "type"" 2016-09-16 12:18:30 +00:00
Jenkins
f7cd6ef27a Merge "Add nova-serialproxy container" 2016-09-16 11:59:39 +00:00
Jenkins
92c680216f Merge "Add ara to collect ansible playbook running statics" 2016-09-16 11:56:47 +00:00
caoyuan
1b8c4ff779 Update "which" command to "type"
Validate a program exist,we should avoid "which"
Refer to http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212

TrivialFix

Change-Id: I3d614aef2ac6598a51d830b02795ef186d4fc531
2016-09-16 11:12:28 +00:00
caoyuan
4b7b4c47e5 Add "python-openstackclient" to test-requirements.txt
TrivialFix

Change-Id: Icca637368427e7ba0f60fc547dedbeba141de269
2016-09-16 11:12:06 +00:00
Paul Bourke
893f14812d Allow operators to customise keystone source install
TrivialFix

Change-Id: I5fb6e2b72e56e018ed640811a9f4d1d77a3efb11
2016-09-16 11:11:32 +01:00
Jenkins
32b74538d8 Merge "Revert 'Add neutron-lbaas-agent to exlude image for Ubuntu binary'" 2016-09-16 10:10:11 +00:00
Jenkins
8485fc9cff Merge "kolla config file path corrected for ubuntu" 2016-09-16 10:08:41 +00:00
Jenkins
2cf3f65bc9 Merge "Use "type" to take place of "which" and update the output" 2016-09-16 09:24:48 +00:00
prithiv
ef9d6ea8be Add networking guide for Neutron extensions
With Kolla supporting Neutron extensions, it is
essential to have networking guide to describe the
installation and configuration of these extensions.

Partial-Bug: #1603391

Change-Id: I78ff5b17e4024d96f8083c96ac5b5b608a7c0015
2016-09-16 10:18:26 +01:00
Jenkins
a9641a6f5d Merge "Add a tip at the end of tools/init-runonce" 2016-09-16 04:07:03 +00:00
prameswar
75bbfa727c kolla config file path corrected for ubuntu
Closes-Bug: #1623967
Change-Id: I214d9ab42b57e94bd13448773432580861aee32f
2016-09-16 02:55:51 +00:00
caoyuan
d48cc50e9e Use "type" to take place of "which" and update the output
When run tools/init-runonce without some client installed,it's
retrun not friendly and confuse people,such as user does not
install python-openstackclient, it will return "openstack not
installed".This patch update it.

Use "type" command to avoid "which"

TrivialFix

Change-Id: I53789a767b3a2727bf2cb848c2881272e313e14c
2016-09-16 09:13:13 +08:00