6685 Commits

Author SHA1 Message Date
Jenkins
a0d2962f48 Merge "Disable elasticsearch output when enable_elasticsearch is no in fluentd" 2017-02-15 16:40:07 +00:00
Jenkins
67d5407db8 Merge "Rename kolla namespace to kolla_ansible" 2017-02-15 15:50:12 +00:00
Jeffrey Zhang
2ae1781d0e Disable elasticsearch output when enable_elasticsearch is no in fluentd
Change-Id: I93fe8141a88d6e0600a1f44fe49d96d7816fae87
Closes-Bug: #1664868
2017-02-15 20:12:33 +08:00
caowei
963e407439 Change freezer service type
Change-Id: I0ea1927fff651bf8fd64a156b86c1378aa4d9d7c
Closes-Bug: #1664936
2017-02-15 19:02:40 +08:00
Jenkins
5b9744e591 Merge "Add default roles used by Barbican" 2017-02-15 08:58:16 +00:00
Jeffrey Zhang
177fbea79a Rename kolla namespace to kolla_ansible
* Rename kolla namespace to kolla_ansible
* remove oslo.config.opts entry points which is uesless
* delete useless tools/version-check.py script

Change-Id: I005dd7223ff23afbb2ce8cbfd0ebec0969102798
2017-02-15 16:34:51 +08:00
caoyuan
c734f53277 Add the missing option for gloabols.yml
- collectd
- remove the unnecessary space

Change-Id: I98c60d29f50bb105ca52cc0060bfcd2b3701e6db
2017-02-15 15:49:14 +08:00
Mauricio Lima
6defea46cb Optimize reconfiguration for collectd
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Change-Id: I0604d262965b27b8bf6c560238811f81c830ea1a
Partially-implements: blueprint better-reconfigure
2017-02-15 15:37:02 +08:00
Jenkins
b7e1d40030 Merge "Optimize reconfiguration for karbor" 2017-02-15 07:26:09 +00:00
Jenkins
aaba647633 Merge "Change Barbican default secret store to pkcs11" 2017-02-15 05:02:50 +00:00
Jeffrey Zhang
397d79c296 Fix doc format
Get follwing error when running tox -edocs

doc/bifrost.rst:91: D001 Line too long
doc/manila-hnas-guide.rst:28: D000 Title underline too short.
doc/manila-hnas-guide.rst:28: D000 Title underline too short.
doc/networking-guide.rst:93: D000 Title underline too short.
doc/networking-guide.rst:93: D000 Title underline too short.
doc/multinode.rst:14: D001 Line too long
doc/quickstart.rst:474: D001 Line too long
doc/vagrant-dev-env.rst:129: D001 Line too long

Change-Id: I88090487a4710547224361d29aaf8371f8340c28
2017-02-15 12:17:49 +08:00
Jenkins
c028b6fdd1 Merge "Fix X-Forward-Proto Header Deletion" 2017-02-15 02:49:28 +00:00
Serguei Bezverkhi
35fee342f0 Changing ironic-inspector configuration for kolla-kubernetes
Changing ironic-inspector configuration for kolla-kubernetes

Change-Id: Ib1ff99d2d58ca9f910b8e68e6076359e2e7ec5a0
Closes-Bug: #1664726
2017-02-14 16:50:51 -05:00
Nenad Radojevic
4385fb682c Add default roles used by Barbican
The default roles used by Barbican are missing.
According to the policy.json the Key Manager
comes with, four roles have to be defined.

Change-Id: I8882c2cf328b62e68797e383b26908540d669629
Closes-Bug: #1657742
2017-02-14 17:06:54 +00:00
Jenkins
dd79b8d1d3 Merge "Checking certificate files for octavia" 2017-02-14 16:29:50 +00:00
Jenkins
39ee9697ad Merge "Add the missing condition for config.yml" 2017-02-14 16:23:01 +00:00
Jenkins
fe3bb84a22 Merge "Fix the host_in_groups error in kolla-kubernetes." 2017-02-14 16:00:25 +00:00
Jenkins
510f9b0172 Merge "Do not check security opt in some case in kolla_docker module" 2017-02-14 15:38:44 +00:00
Jenkins
042a5f978e Merge "update dispatcher configurations for database backend" 2017-02-14 15:24:37 +00:00
Jenkins
e84fe597ed Merge "Fix haproxy configure for external placement api listen" 2017-02-14 15:22:40 +00:00
Jeffrey Zhang
a1901d4264 Fix the host_in_groups error in kolla-kubernetes.
* add if orchestration_engine == 'KUBERNETES' for host_in_groups
* use the same indent for host_in_groups variable, otherwise YAML will
  add a '\n' character for each line.

Change-Id: Idf6eecb451281d5cdc16df318bcd8ae9f5561b02
2017-02-14 15:13:50 +00:00
Jenkins
4209991343 Merge "Add how configure backend to cinder HNAS NFS driver guide" 2017-02-14 12:29:52 +00:00
Jeffrey Zhang
70d1dcb397 Fix haproxy configure for external placement api listen
Need listen on external ip address rather then internal.

Change-Id: Ic1b8823b97e52793088cf1f82625107c69ec345b
2017-02-14 20:22:38 +08:00
Jenkins
44eee94d09 Merge "Move Kuryr to start after neutron has started" 2017-02-14 09:11:24 +00:00
caoyuan
1c3c611f40 Add the missing condition for config.yml
- add "item.value.enabled | bool"
- add "| bool" to keystone
- add group check for searchlight

Change-Id: Id4555a0a96ea1670e99c88a1da9d3e07bf253497
2017-02-14 11:19:26 +08:00
Jenkins
c41bd291cc Merge "Fixing ironic configs for kolla-kubernetes" 2017-02-14 01:32:39 +00:00
Jenkins
f099ed6392 Merge "Disable revoke_by_id in keystone" 2017-02-14 01:15:59 +00:00
Charlie Kang
0012dec455 Move Kuryr to start after neutron has started
ERROR kuryr EndpointNotFound: public endpoint for network service not found

Closes-Bug: 1664351

Change-Id: I5dec28f42c362d2143a7e56f4187a28afa6e0142
2017-02-13 23:18:31 +00:00
Jenkins
082a06b493 Merge "Use new bootstrap and register method" 2017-02-13 23:04:52 +00:00
Jenkins
fc6bde965e Merge "Recover nova reload task to upgrade" 2017-02-13 17:54:59 +00:00
Jenkins
5b8d692ded Merge "Close file-like object after used" 2017-02-13 16:23:17 +00:00
Serguei Bezverkhi
d4af2e27d2 Fixing ironic configs for kolla-kubernetes
Fixing ironic configs for kolla-kubernetes

Change-Id: Id1b1cc3bb3c1790a77f9449ec5b0b5d1c67f91e4
Closes-Bug: #1664269
2017-02-13 10:11:53 -05:00
Jeffrey Zhang
ba023042b2 Disable revoke_by_id in keystone
revoke api is only used when using kvs revoke driver. In most of case it
is useless and unnecessary.

Change-Id: I6afaf32574330e3ee57435f688c41ae74dbdf7ed
Closes-Bug: #1664026
2017-02-13 21:39:44 +08:00
Mauricio Lima
2bd55cd105 Add how configure backend to cinder HNAS NFS driver guide
Change-Id: Ic616cf20a4e889b825224c1c32449fb52763eb6a
2017-02-13 09:57:41 -03:00
Mauricio Lima
871733c956 Optimize reconfiguration for designate
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Co-Authored-By: Francisco Edigleison Barbosa <barbosaedigleison@gmail.com>
Change-Id: I68c7e753060af2544acdb7d0a2c641c85bad42c6
Partially-implements: blueprint better-reconfigure
2017-02-13 20:39:33 +08:00
liyingjun
68d30d8fd6 Checking certificate files for octavia
There is not precheck for certificate files for octavia, this patch
add it.

Change-Id: I0031a65d5c83c09ce0e16db9094f3dea12024495
Closes-bug: #1663575
2017-02-13 09:51:49 +00:00
Jenkins
d309543f4a Merge "Fix kibana upgrade permission issue" 2017-02-13 09:33:02 +00:00
zhubingbing
d52d1beefa Fix kibana upgrade permission issue
Change-Id: I882dc0e6825dd8994ca66257f9a71b34ad780935
2017-02-13 03:39:39 +00:00
Jenkins
7fd2d33f87 Merge "provide a universal collectd template" 2017-02-13 02:59:02 +00:00
Jenkins
96185846c3 Merge "Optimize reconfigure action for neutron" 2017-02-13 02:12:32 +00:00
Jeffrey Zhang
a4beb63c20 Optimize reconfigure action for neutron
Partially-implements: blueprint better-reconfigure
Change-Id: I3879b9339b54e1d063dd1c4673bac85ced333335
2017-02-12 15:39:41 +00:00
Steven Dake
6cb4507267 Fixes problem with kolla-kubernetes 3.0.2 images
The kolla-kubernetes deliverable uses Newton images, however,
the kolla-ansible 4.0.0 deliverable is targeted at Ocata.  In
Ocata, nova requires the placement API implementation.  This
change is transitory until genconfig is no longer required
for kolla-kubernetes to operate.

Change-Id: I1c192a01d91b4f507bafadb53b6abb1efdcdb46c
Closes-Bug: #1663961
2017-02-12 07:44:20 -07:00
Jeffrey Zhang
5872392b59 Fix horizon pull error
Change-Id: I046da36b6086698742a88068328554f0447c3bbd
2017-02-12 07:44:20 -07:00
Jeffrey Zhang
38813f8c74 Install ansible without upper constraints
Ansible use jinja2 < 2.9, but requirements/upper-constraints.txt
requires jinja2===2.9.5. Installing ansible shouldn't use upper
constraints provides by OpenStack.

Change-Id: Ib37e8d06373a61959b41b8737085d5f001650e42
2017-02-12 07:44:16 -07:00
Jenkins
5f3456bf39 Merge "Optimize reconfigure action for horizon" 2017-02-10 13:19:18 +00:00
Jenkins
b8c852ea24 Merge "Remove unnecessary file in .gitignore" 2017-02-10 13:19:12 +00:00
Jenkins
9e9523dc10 Merge "Fix the path error in globals.yml" 2017-02-10 13:19:06 +00:00
Jenkins
be025a3ca3 Merge "This feature is supporting for workers config in swift servers." 2017-02-10 11:56:12 +00:00
zhubingbing
553a05c9d0 Fix 'kibana_config_jsons' is undefined
Change-Id: I88f84e21ec6ae6dd98f672112f34be8d53f2e2ad
2017-02-10 10:08:58 +00:00
Jenkins
28f6e67da0 Merge "Optimize reconfiguration for etcd" 2017-02-10 07:13:34 +00:00