7049 Commits

Author SHA1 Message Date
Bertrand Lallau
3ec2a23428 Revert "Fix Fluentd warn on dnsmasq.log file parsing"
Issue seems not fixed, it requires more work

This reverts commit 4f6470bb56e70cb65da7b9b9c044029eefb2533c.

Change-Id: I308ea4e0d5ace60cf730944e1883966fc6f8f8ce
2017-04-05 19:08:58 +00:00
Jenkins
6d6d7b37fa Merge "Change heat cfn service description" 2017-04-05 15:46:58 +00:00
Eduardo Gonzalez
5ed07f9ffe Add release note for versionless keystone endpoint
Include an upgrade release note to make users know
that endpoint are going to be updated while upgrading
to Pike.

Change-Id: Iaa2bfce27e9d9cdbb574121147fc761810d7dd71
2017-04-05 12:53:36 +00:00
Jenkins
afed70a3df Merge "Remove Ubuntu 14.04 related code" 2017-04-05 12:26:29 +00:00
Jenkins
a97503c315 Merge "Remove min_l3_agents_per_router option" 2017-04-05 11:52:08 +00:00
Jenkins
ed0f2fc819 Merge "Fix Telegraf retention policy not found" 2017-04-05 11:32:25 +00:00
Jenkins
fe713dba33 Merge "Telegraf: activate influxdb input plugin" 2017-04-05 11:21:29 +00:00
Jenkins
7eacf5da96 Merge "Fix the "tox -e docs" failed" 2017-04-05 11:20:57 +00:00
Jenkins
78bf582329 Merge "Fix qos rules are not applied on ocata with ovs" 2017-04-05 11:20:04 +00:00
Bertrand Lallau
bfecaf3857 Telegraf: activate influxdb input plugin
The InfluxDB plugin will collect metrics on the given InfluxDB servers.

Change-Id: I23f0433f56047369ce19bbf3236f6dd7038eb06e
2017-04-05 08:32:53 +02:00
Jenkins
7c7ead154d Merge "Use versionless keystone endpoints" 2017-04-05 04:51:33 +00:00
Jenkins
dd9e1e5a28 Merge "Fix Fluentd warn on dnsmasq.log file parsing" 2017-04-04 20:40:02 +00:00
Eduardo Gonzalez
1ab0c16ba3 Fix senlin workers and events
Remove deprecation warning about service_token_roles_required
Set number of engine workers to avoid too many resources consuming.
Senlin can poll events from ceilometer when is enabled.

Closes-Bug: #1679697
Change-Id: I8b13d1f492344ca0b65020eb56f0e016c6bb6369
2017-04-04 13:34:21 +00:00
Pavel Glushchak
98f3283dc9 Remove unused driver attr in cinder_backends map
Change-Id: Ib684e3f4bcd26e40c5bfde9bec8a1d83563d5460
Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
2017-04-04 14:09:24 +03:00
Bertrand Lallau
a914fb6671 Fix Telegraf retention policy not found
New version of influxdb use "autogen" as default retention policy name.
Please see https://github.com/influxdata/influxdb/issues/3733 for more
info.

Change-Id: I8aeb47f60b3aeb022e0cd7aaac630d7cad5b0099
Closes-Bug: #1673914
2017-04-04 10:22:05 +02:00
Jenkins
57fb2e735c Merge "Fix ceph log location" 2017-04-04 06:05:58 +00:00
Jenkins
f2db4c0f17 Merge "Fix the check.yml of Zun does not exist" 2017-04-04 01:18:42 +00:00
Bertrand Lallau
d9ce5cf6c0 Fix outdated InfluxDB configuration
Actual InfluxDB config is deprecated, it must be updated based on the
following documentation:
https://docs.influxdata.com/influxdb/v1.2/administration/config

* remove following options:
  lease-duration = "1m0s"
  pprof-enabled = false
22173acb70

* rename "cluster" section to "coordination":
75e89e35d8

* remove shard-writer-timeout option:
  shard-writer-timeout = "5s"
db7d58c867

Closes-Bug: #1678982
Change-Id: Id905336123bc5aa76d6e6903a82f915c3702669f
2017-04-03 17:13:11 +02:00
Bertrand Lallau
5782a214e9 Karbor services restarting issue on conf update
In case of karbor-protection providers.d/openstack-infra.conf config file modification,
karbor-operationengine and karbor-api are restarted too, but they should
not.

karbor-operationengine startup command:
https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/karbor/templates/karbor-operationengine.json.j2#L2

karbor-api startup command:
https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/karbor/templates/karbor-api.json.j2#L2

Change-Id: I91a0273ccf46e340315cf885ea01db6e14653182
Closes-Bug: #1677542
2017-04-03 12:45:28 +02:00
caoyuan
ff46e0908f Update the cirros version to "0.3.5"
Refer to
https://docs.openstack.org/ocata/install-guide-rdo/glance-verify.html

Change-Id: Ic2a32a3f17a11f1f6e8ecf0f7271d7d1f12ca5bc
2017-04-03 16:04:12 +08:00
caoyuan
b9378126e9 Fix the "tox -e docs" failed
doc/running-tests.rst:64: D001 Line too long
doc/bifrost.rst:164: D000 Unknown target name: "edit-inventory".
doc/nova-fake-driver.rst:: WARNING: document isn't included in any
toctree

Change-Id: I83bb44ed10cb464f87e5235a423a475151ace208
2017-04-03 15:53:28 +08:00
Jenkins
1295f583a1 Merge "Use yaml.safe_dump() instead of yaml.dump()" 2017-04-03 03:53:29 +00:00
Bertrand Lallau
4f6470bb56 Fix Fluentd warn on dnsmasq.log file parsing
Fluentd actually parse all files in /var/log/kolla/*/*.log as Openstack
services files.
Dnsmasq file /var/log/kolla/neutron/dnsmasq.log, must be add to
exclude_path to avoid this warning message:
"/var/log/kolla/neutron/dnsmasq.log unreadable. It is excluded and would
be examined next time."

Change-Id: I8dc5320b9ed299200c4f1e6ee52d34a918e2f110
Closes-Bug: #1678530
2017-04-02 08:59:21 +02:00
shaofeng_cheng
fbb0dedb10 Fix qos rules are not applied on ocata with ovs
If the Open vSwitch agent is being used, set extensions to qos
in the [agent] section of ml2_conf.ini.
see
https://docs.openstack.org/ocata/networking-guide/config-qos.html

Change-Id: I85272b03222775b14a311a110077a8eed736f56c
Closes-Bug: #1676319
2017-04-01 14:33:54 +08:00
Eduardo Gonzalez
4c27bd0d41 Fix Haproxy reconfigure
HAproxy always restart containers when doing reconfigure.
compare_container not evaluate privileged while the containers
are privileged.
compare_container always evaluates true because of this.

Closes-Bug: #1678122
Change-Id: Iaea80c1e09ef16a6d2530a75e6f37e6259bb4ca7
2017-03-31 12:48:28 +00:00
Bertrand Lallau
b257b2a676 Trove services restarting issue on conf update
In case of trove-api service config file modification (trove.conf file),
trove-conductor and trove-taskmanager are restarted too, but they should
not.

trove-conductor startup command:
https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/trove/templates/trove-conductor.json.j2#L2
=> trove.conf is not used

trove-taskmanager startup command:
https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/trove/templates/trove-taskmanager.json.j2#L2
=> trove.conf is not used

Change-Id: Ic4703a571cec5bf8b3f91cfcb9da1a23e2bb300b
Closes-Bug: #1677531
2017-03-31 12:56:00 +02:00
Mick Thompson
91321ac8ff Update Keystone haproxy config to balance based on source ip
Source based routing is necessary for some services where we want the
same clients land to the same servers.

For exanmple, Keystone uses one of many memcached servers - if a client
gets a token from one but then lands on another api server on the next
request, that will bind to another cache and we get failed
authentication.

Other examples are horizon/murano where we upload a package in several
steps. If we don't balance client connections to the same host we will
end up with the package downloaded to one host but unsuccessfully
unpacked/imported on another host.

This option is commonly used in the official OpenStack docs [0]

[0] https://docs.openstack.org/ha-guide/controller-ha-haproxy.html

Co-Authored-By: James McCarthy <james.m.mccarthy@oracle.com>

Change-Id: I56f1e48f6dbe457e776a474222073bbefc48c92a
2017-03-31 09:31:10 +00:00
caoyuan
61156a9b6e Fix the check.yml of Zun does not exist
Change-Id: I79d99acfb9410d83ab1c84df3553db463f3f948f
Closes-Bug: #1677952
2017-03-31 11:42:28 +08:00
caoyuan
90bf34f0aa Fix the "Creating the Zun service and endpoint" failed
- fix the zun deploy failed
- remove the unnecessary register

Change-Id: I06bbad44de3f391a1c8939e8a587feababebc986
Closes-Bug: #1677665
2017-03-30 23:58:50 +08:00
Jenkins
bed0357931 Merge "Remove useless variable glance_backend_file" 2017-03-30 15:11:22 +00:00
Jenkins
2b3ec9fa18 Merge "Fix cinder config group in nova.conf" 2017-03-30 15:03:47 +00:00
Jenkins
aa68c84463 Merge "Add zun ansible role" 2017-03-30 13:46:06 +00:00
Jenkins
b5a0ed3280 Merge "Remove image building related docs from kolla-ansible" 2017-03-30 13:20:45 +00:00
Jenkins
f485bd0ac3 Merge "Optimize reconfiguration for haproxy" 2017-03-30 13:14:07 +00:00
Paul Bourke
ab83caeba0 Remove image building related docs from kolla-ansible
Add links to refer to the main Kolla documentation. Also fix minor
formatting errors that were preventing the docs from building.

Change-Id: I8759b9e995097d221900441bd001a1234ae007fd
Depends-On: Ia7959c71a241b9d7139ec50b34e36b24fbcf76e6
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
2017-03-30 13:07:55 +00:00
Jenkins
c250d7af0e Merge "Updated from global requirements" 2017-03-30 12:20:18 +00:00
Mauricio Lima
a836033e14 Optimize reconfiguration for haproxy
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Change-Id: Iddde03760ff85af5263868ebc47b8b9438e92e8e
Partially-implements: blueprint better-reconfigure
2017-03-30 18:36:31 +08:00
Jenkins
88eb3a9696 Merge "Trove fix backup restore with Swift" 2017-03-30 09:16:52 +00:00
Jenkins
79eb687ea8 Merge "Set to Unix format trove-conductor.conf file" 2017-03-30 09:16:21 +00:00
zhuzeyu
a1e2901c30 Use yaml.safe_dump() instead of yaml.dump()
Remove Python specific types from YAML output
Produce only basic YAML tags

Change-Id: Ib6a4c18663897efb7243ed1ff84df1c9f2abf8bf
2017-03-30 16:54:05 +08:00
jimmygc
867c3bda39 Remove useless variable glance_backend_file
When glance_backend_ceph is not enabled, glance uses file as
backend store by default. Since glance_backend_file is useless
and not overriding glance backend when glance_backend_ceph is
enabled. I think it is good to remove it.

Change-Id: I94cbd8661e43ab296478470ed57d0effc5622ee5
2017-03-30 16:16:47 +08:00
root
2364bee3cc Add zun ansible role
Change-Id: I13cf03d6a97fb94dd7cb309e99a417ad101dc21a
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Partially-implements: bp add-zun-ansible-role
2017-03-30 04:15:17 -04:00
shaofeng_cheng
83fae8c8f9 Fix secure_proxy_ssl_header option
Option "secure_proxy_ssl_header" from group "DEFAULT" is deprecated
in Keystone.

see
https://docs.openstack.org/ocata/config-reference/identity/samples/keystone.conf.html

Change-Id: I390969fce5b592c0267399969abc54e5caffbfc8
Closes-Bug: #1675982
2017-03-30 15:49:51 +08:00
Cady_Chen
1f3ac2a5c7 Allow nfs, rpcbind and mountd service on server firewall
In order to slove the problem of running `vagrant up` hangs on
NFS mounting, we can allow these services on server firewall.

Change-Id: I70fb072b6103fa662fcfaaafd0f8f57e45193798
Closes-Bug: #1675378
2017-03-30 02:05:01 +00:00
shaofeng_cheng
9ded0dbacd Fix cinder config group in nova.conf
If disable cinder in openstack environment.
Cinder of configuration items do not need to configure in nova.conf

Change-Id: Ie346dfe45f8c2d3fd383095d0c64f8e9421100ff
2017-03-30 09:24:54 +08:00
ZhongShengping
66ac7aa459 Remove min_l3_agents_per_router option
min_l3_agents_per_router parameter has been removed in neutron[0].
So we can remove it.

[0] https://github.com/openstack/neutron/blob/master/releasenotes/notes/remove-min-l3-agents-per-router-27aef7d91dec0348.yaml

Change-Id: Ia3f3686e2cc27e4bd0707add50ebc552117d6b03
Closes-Bug: #1677101
2017-03-30 08:44:48 +08:00
Bertrand Lallau
8e2b341cfd Set to Unix format trove-conductor.conf file
Replace all DOS carriage returns (^M) with Unix line feeds.

Change-Id: I0cb757e2aa9c08d87d5da64cc416b3d468219df6
2017-03-29 21:38:24 +02:00
Bertrand Lallau
b6ab5bf7e9 Trove fix backup restore with Swift
'v1' is missing in DEFAULT/swift_url property for trove.conf and
trove-taskmanager.conf file.

Closes-Bug: #1677362
Change-Id: I7f625b1ac665a26c4207c3cbb9b0238da82993d8
2017-03-29 21:32:25 +02:00
OpenStack Proposal Bot
2e63113efb Updated from global requirements
Change-Id: Ie2ff57cb04d5f2331d22838d9a627900e5b1f8a2
2017-03-29 18:43:05 +00:00
Jenkins
04ebda9e44 Merge "Revert "Fixes problem with kolla-kubernetes 3.0.2 images"" 2017-03-29 15:06:37 +00:00