2322 Commits

Author SHA1 Message Date
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
Jenkins
5f3456bf39 Merge "Optimize reconfigure action for horizon" 2017-02-10 13:19:18 +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
Jenkins
ac8a614488 Merge "use_forwarded_for is moved to api group" 2017-02-09 23:06:48 +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
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
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
Jeffrey Zhang
5355155783 Fix copying over nfs_shares task failure
Change-Id: I2e050d811a26ac83f2336d25b02952a9e9835142
Closes-Bug: #1662625
2017-02-08 16:26:56 +08:00
zhuzeyu
6e6a36944e Using yaml.safe_load instead of yaml.load
It is not safe to call yaml.load with any data received from
an untrusted source, we'd better use yaml.safe_load

Reference:
https://security.openstack.org/guidelines/dg_avoid-dangerous-input-parsing-libraries.html

Change-Id: Ic8bf73bf0f2e2c29eb48094367cf558483be1267
2017-02-08 12:02:52 +08:00
Jenkins
0a8e2a6206 Merge "Bump docker to 1.12 in bootstrap-servers" 2017-02-07 17:32:18 +00:00
Jenkins
091b17a356 Merge "Allow configuration of HAProxy default timeouts" 2017-02-07 17:31:32 +00:00
Jenkins
db7ee0f16d Merge "Fluentd should not chown all files in /var/log/kolla" 2017-02-07 16:34:21 +00:00
Jenkins
7a8007e7a9 Merge "Load freezer dashboard" 2017-02-07 16:33:49 +00:00
Vladislav Belogrudov
f556a42a87 Allow configuration of HAProxy default timeouts
With this fix operator can tune client/server timeouts of HAProxy
to avoid receiving '504' for lengthy requests by API clients.

Change-Id: I12611b34f99759e6b6527fea3768a971c9fbdd71
Closes-Bug: #1662506
2017-02-07 18:21:57 +03:00
Jenkins
000e850933 Merge "Add the missing pull image for ironic-dnsmasq" 2017-02-07 14:43:45 +00:00
Jenkins
c9034d0423 Merge "Mount mnt folder when enabled cinder nfs backend" 2017-02-07 14:19:03 +00:00
Jenkins
75aec933ee Merge "Fix the WARNING in copy keystone domain task" 2017-02-07 14:18:57 +00:00
Jenkins
a662775464 Merge "Fix gnocchi auth issue" 2017-02-07 14:10:02 +00:00
Jenkins
0d16ad7343 Merge "This feature is supporting for collecting log from IPA." 2017-02-07 08:51:42 +00:00
Mauricio Lima
b155ad5d96 Optimize reconfiguration for etcd
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Change-Id: I1cd494afd3a76e832272e70e9e1e5a41a522a31e
Partially-implements: blueprint better-reconfigure
2017-02-06 23:01:09 +08:00
caoyuan
e58a2d85ca Add the missing pull image for ironic-dnsmasq
Change-Id: I7c5188c8b13b4dc728b201a29b6d304a7d396201
2017-02-06 22:35:37 +08:00
Jenkins
36408dde59 Merge "Change freezer exact syntax problem" 2017-02-06 09:02:08 +00:00
zhubingbing
d6b4c25d20 Change freezer exact syntax problem
Closes-Bug: #1662068

Change-Id: I57d4df3ccb70471d8509fcffb351bd254fec567b
2017-02-06 05:35:44 +00:00
Jeffrey Zhang
078dd5566e Mount mnt folder when enabled cinder nfs backend
Change-Id: Ib3d0067ce4bc90245664a2fff337d4e71e4214c1
2017-02-06 10:53:17 +08:00
Jenkins
747b100e48 Merge "Fix parameter issue in cinder handlers" 2017-02-05 15:08:59 +00:00
caowei
d467161399 Load freezer dashboard
Change-Id: Ib7354920de24dbab9481553bad6521e2f5e93fae
Depends-On: I8a70c7e95cdd6517816060e148d3fdc4857182f4
Closes-Bug: #1661953
2017-02-05 21:24:34 +08:00
Jenkins
4938e80b81 Merge "Enable tacker_horizon when enable_tacker is yes" 2017-02-05 12:57:50 +00:00
Jenkins
6aa03e5611 Merge "Fix grafana database creation" 2017-02-05 12:51:25 +00:00
Jeffrey Zhang
2b402ace4d Fix the WARNING in copy keystone domain task
Change-Id: I2bf2e8a6ba17c813bb2b9cdf05d3062f29d9fdf6
Closes-Bug: #1653168
2017-02-05 20:49:20 +08:00
Jenkins
6856a6f804 Merge "Integrate designate with neutron" 2017-02-05 02:36:21 +00:00
caoyuan
13eed1ba57 Optimize reconfiguration for kibana
Change-Id: Ic4beb20361644b42dbed82fcffb7446c00f84e87
Partially-implements: blueprint better-reconfigure
2017-02-04 15:16:17 +00:00
Mauricio Lima
4957752286 Fix parameter issue in cinder handlers
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I92c0757af6567cbb4ff338493df9931ebef3366c
2017-02-04 15:55:29 +08:00
Jenkins
d7bc9a01ad Merge "Apply new register method" 2017-02-04 06:16:19 +00:00
Jenkins
6c33871071 Merge "Create a new container when restart a container when necessary" 2017-02-04 06:09:11 +00:00
Jeffrey Zhang
f4b0b359f9 Fluentd should not chown all files in /var/log/kolla
Change-Id: If77663306e68e7a35f3e6772490a5622b7a8d32f
2017-02-04 05:16:55 +00:00