6495 Commits

Author SHA1 Message Date
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
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
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
Jenkins
8676d17d56 Merge "Optimize reconfiguration for kibana" 2017-02-10 07:08:00 +00:00
Jenkins
e3411f4f81 Merge "Optimize reconfiguration for tacker" 2017-02-10 06:58:13 +00:00
zhuzeyu
84ff7c2a18 Fix the path error in globals.yml
Change-Id: I963ac5512c711f639dc7ad6c7b1f217589373b0a
2017-02-10 12:04:02 +08:00
zhuzeyu
fe4c4a4a39 Remove unnecessary file in .gitignore
Kolla-Ansible repo will never generate etc/kolla/kolla-build.conf

Change-Id: I49eff2d3394a9e7c527614b2e5003117ff7a7d73
2017-02-10 11:45:24 +08:00
Jenkins
ac8a614488 Merge "use_forwarded_for is moved to api group" 2017-02-09 23:06:48 +00:00
Jenkins
c90236967a Merge "Add Octavia doc link in README.rst" 2017-02-09 23:05:15 +00:00
Jenkins
6761120111 Merge "Custom init-runonce values" 2017-02-09 12:16:46 +00:00
Jenkins
c165242614 Merge "Fix copying over nfs_shares task failure" 2017-02-09 12:15:14 +00:00
Jenkins
3026cef7cf Merge "Fix fluentd config error" 2017-02-09 12:14:27 +00:00
Jenkins
3d593bf6ac Merge "Fix telegraf task" 2017-02-09 07:46:39 +00:00
caowei
6740370920 Add Octavia doc link in README.rst
Change-Id: I88814562dbcc750fe8d9b57eb07ba4cbe30f33d8
2017-02-09 15:36:49 +08:00
zhubingbing
90e13efd65 Fix fluentd config error
Depends-On: 810fcdd28669bbd317c290d498d590ddb2c32f65
Change-Id: I88eff57448cc29ddff0f301f210623b2309e6b4d
Closes-Bug: #1663126
2017-02-09 06:48:41 +00:00
Jeffrey Zhang
7d66beec92 use_forwarded_for is moved to api group
See the nova code in[0].

[0] https://github.com/openstack/nova/blob/master/nova/conf/api.py#L35

Change-Id: I87861ac44d99699f7a11b5cc383a2f43c47c2b04
2017-02-09 14:30:10 +08:00
Jenkins
90eb3c4818 Merge "Fixing authentication url for kubernetes" 2017-02-09 03:48:33 +00:00
Jenkins
e2f6c30e81 Merge "Optimize reconfiguration for aodh" 2017-02-09 03:33:38 +00:00
caoyuan
fdecd21246 Optimize reconfigure action for horizon
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Ieb44258cd99744a92ef1aa958e3bdccf9519f212
Partially-implements: blueprint better-reconfigure
2017-02-09 11:32:32 +08:00
Serguei Bezverkhi
40ce12bd04 Fixing authentication url for kubernetes
Fixing authentication url for kubernetes

Change-Id: Idb0151f8ae8f785a34f3ea1feee2d33a6afa0987
2017-02-08 21:07:07 -05:00
liyingjun
6b47d8284b Fix telegraf task
When enabling telegraf, task failed with "the field 'vars' has an invalid value,
which appears to include a variable that is undefined. The error was: 'dict
object' has no attribute 'telegraf_services'"

Change-Id: I6dd5c401bf9b673685ad1b4a20f85c55ce04abbc
Closes-bug: #1662807
2017-02-08 20:05:40 -05:00
Jenkins
d124e4a93c Merge "Optimize reconfiguration for elasticsearch" 2017-02-08 19:38:06 +00:00
Jenkins
d17db0d9e9 Merge "Modify the version_info in pbr" 2017-02-08 19:07:25 +00:00
Jenkins
4d75216889 Merge "adds ovs-dpdkctl tool" 2017-02-08 18:56:14 +00:00
Jenkins
78e00a953a Merge "Use neutron user in neutron_lbaas.conf and overwrite defaults" 2017-02-08 18:55:04 +00:00
Jenkins
4611eeda44 Merge "Using yaml.safe_load instead of yaml.load" 2017-02-08 18:31:25 +00:00
Jenkins
d561c23496 Merge "Fix BASEDIR to package Kolla with snapcraft.io" 2017-02-08 18:30:09 +00:00
Eduardo Gonzalez
b402dd16ed Recover nova reload task to upgrade
Sighup signal is neccessary to reload upgrade levels
on all services communicating with rpc.
If not rpc version will remain in Newton.

Change-Id: I4b02d933699aa9b013dfbc65d1e57d53db49bcee
2017-02-08 10:45:41 +00:00
caowei
515bef3cc6 Remove Zaqar doc link in README.rst
Zaqar role is not implemented.

Change-Id: I0a77994eaa326c902de8a8accef497e4880e9403
2017-02-08 18:32:19 +08:00
Jeffrey Zhang
5355155783 Fix copying over nfs_shares task failure
Change-Id: I2e050d811a26ac83f2336d25b02952a9e9835142
Closes-Bug: #1662625
2017-02-08 16:26:56 +08:00
Jenkins
b2b325c839 Merge "Add Freezer doc link in README.rst" 2017-02-08 06:50:49 +00:00