3175 Commits

Author SHA1 Message Date
Jenkins
5f03cc22c6 Merge "Add vmware support to ceilometer" 2017-08-16 15:26:20 +00:00
Jenkins
d8635d5563 Merge "Add ironic log in fluentd" 2017-08-16 11:48:31 +00:00
Jenkins
ad05c4da3b Merge "Fix wrong condition for iscsid container" 2017-08-16 08:29:17 +00:00
Jenkins
1785997a56 Merge "Standardize Fluentd grammar usage" 2017-08-16 05:26:05 +00:00
Jenkins
b4d7592adb Merge "Support customizing grafana home dashboard" 2017-08-16 03:52:34 +00:00
guochao
7b385f9857 Add vmware support to ceilometer
Change-Id: I701a26ade57916c9e2ca6899228d4660230b1e0b
Partially-implements: blueprint kolla-ansible-support-vsphere
Depends-On:I0f37e49e09c4f14a64797506007bb55a6f534f0f
2017-08-16 09:07:13 +08:00
Jenkins
3393054f9b Merge "Add vSphere support to nova_compute" 2017-08-15 14:44:06 +00:00
Jenkins
1b2caf7d96 Merge "Add collectd support to telegraf container" 2017-08-15 14:32:37 +00:00
zhubingbing
90149adb81 Add ironic log in fluentd
Closes-Bug :#1710842

Change-Id: Ie676fcf4acb0d08f232a8db9313212b819e500de
2017-08-15 10:25:28 +00:00
Jenkins
2e6fa4fe15 Merge "Unify external_ceph.yml filename" 2017-08-15 09:18:16 +00:00
Jenkins
1c7d8dfd9b Merge "Add evaluation_interval option" 2017-08-15 09:16:22 +00:00
Jenkins
e5d9295441 Merge "enable CORS for Gnocchi and Keystone for grafana datasource" 2017-08-15 09:15:46 +00:00
Jenkins
be5ae825e6 Merge "Fix the domain name in admin-openrc.sh.j2" 2017-08-14 11:23:11 +00:00
Jenkins
e5df37608f Merge "copy cinder_backup keyring from cinder_backup" 2017-08-14 11:09:24 +00:00
Jenkins
64b3716e61 Merge "Add fwaas support to vsphere by vmware-nsx plugin" 2017-08-11 11:21:17 +00:00
Jenkins
89a55b4f44 Merge "Clear all l3 related namespace before starting neutron-l3-agent" 2017-08-11 11:16:43 +00:00
Jenkins
5f005c2509 Merge "Skydive: enable logging in file" 2017-08-11 10:13:09 +00:00
Bertrand Lallau
2e3b8739d0 Standardize Fluentd grammar usage
'@type' must be used everywhere.

Change-Id: I337f42e174393f68b43e876ef075a74c887a5314
2017-08-11 09:10:40 +02:00
chao liu
23863a7101 Fix a typo in all.yml: replace Vaid with Valid
Change-Id: I4dd04a7235285d14fbb15b35f4bcd2fe88d09ca3
2017-08-10 17:58:22 -07:00
Jenkins
ed33915242 Merge "Update default settings in libvirtd.conf jinja template" 2017-08-10 19:09:57 +00:00
Jenkins
ed1030bfbe Merge "introduce playbook to ovs with dpdk" 2017-08-10 18:03:52 +00:00
James McCarthy
24427735da Update default settings in libvirtd.conf jinja template
Existing defaults are setup for tcp, and set ca_file to an empty string.
'If you set this to an empty string, then no trusted CA certificate is loaded.'

libvirt may complain 'unsupported configuration: No server certificate path
set to match server key', as such tls should also be explicitly set to 0.

Change-Id: I49c64808cb236dab1d9fa2e699d0a2f2fc54cc99
2017-08-10 15:42:12 +01:00
guochao
ee66b6468d Fix wrong condition for iscsid container
Iscsid is not only needed by cinder lvm backend, but also by ironic
conductor container.

Change-Id: I903cda88ca71ba31b30c220761f33808495aba72
Closes-Bug: #1709809
2017-08-10 08:09:01 +00:00
Sean Mooney
781d84658d introduce playbook to ovs with dpdk
- This change creates a new role to
  support deploying ovs with dpdk.
- This change introduces an enable_ovs_dpdk
  variable to enable ovs with dpdk as part of
  the deploy action.
- This change extends the ovs-dpdkctl.sh tool
  to correctly deploy ovs-dpdk on Ubuntu and CentOS
  hosts.
- This change extends the cleanup-host tool
  to correctly uninstall ovs-dpdkctl.sh tool and its
  systemd files if present on the host.
- This change automatically configures userspace
  kernel drivers.

partial-implementes: bp/ovs-dpdk
Change-Id: I55858d81df437e8258705b75426f61ab9b907c7d
2017-08-09 18:43:06 +00:00
zhubingbing
b1c980942d Move placement-api-access log format to apache_access
placement-api-access.log type is apache_access

Change-Id: Ie29b9f04f2d166d04a4fee53f3749911b44a9bf1
Closes-Bug: #1709054
2017-08-08 06:03:39 +00:00
Mathieu Rohon
ae4ab21157 Skydive: enable logging in file
Change-Id: I24f040b686b4dd24b26fc5c5fc5bd5e7ef8a4e70
Depends-on: I464cb4700ca143c1dbac3c20f7402ddb8cda7ce7
2017-08-07 11:11:41 +02:00
Christian Berendt
7f4742ff4b Unify external_ceph.yml filename
It is external_ceph.yml for cinder/glance/gnocchi.

Change-Id: I534bffe5fc914e2850fb5cb5719fd99afa06c6c4
2017-08-07 10:44:54 +02:00
Jenkins
86fc2160f7 Merge "Fix openstack_python not accurate match" 2017-08-07 01:45:57 +00:00
Alex Yang
eeb8014964 Fix the domain name in admin-openrc.sh.j2
Because the default domain name is "Default" in
ansible/group_vars/all.yml (default domain id is "default"),
the domain name in admin-openrc also should be "Default".

Change-Id: I05f905d87ca57c09d4bdf540c4efbe06ee9bff67
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-07 08:38:54 +08:00
guochao
c9eaf9158b Add vSphere support to nova_compute
Implements compute part of the blueprint.
Make virt_type of nova_compute configerable.

Change-Id: I0f37e49e09c4f14a64797506007bb55a6f534f0f
Partially-implements: blueprint kolla-ansible-support-vsphere
Co-Authored-By: shaofeng cheng <chengsf@winhong.com>
2017-08-04 17:15:57 +08:00
Jenkins
f934618541 Merge "Fix log greedy match" 2017-08-04 01:53:04 +00:00
Jenkins
d6db2569bb Merge "Add OpenDaylight role" 2017-08-03 16:29:38 +00:00
Marcus G K Williams
57496c4147 Add OpenDaylight role
Adds role for OpenDaylight deploy.

Change-Id: I1e697ea4d3f33aab4b0f55863a377b39eda8f609
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Co-Authored-By: Jiri Prokes <jirix.x.prokes@intel.com>
Co-Authored-By: Eduardo Gonzalez <dabarren@gmail.com>
Partially-Implements: blueprint opendaylight-support
2017-08-03 07:39:38 -07:00
zhubingbing
18b1737d58 Add gnocchi log on fluentd
Change-Id: I43fec45a49198daedddbb7c5d477690bbe3864e8
2017-08-03 16:34:54 +08:00
zhubingbing
14e9d9fb3d Fix openstack_python not accurate match
http://paste.openstack.org/show/617484/

Change-Id: I1c771b8012c12300adb611b85898bbf2ef2fe67f
Closes-Bug: #1708449
2017-08-03 16:13:54 +08:00
zhubingbing
3529a5204a Fix log greedy match
for example: the placement-api regular match
will override placement-api-access

Change-Id: I80ed896b2477709599be0ce73e00d03da1858349
Closes-Bug: #1708468
2017-08-03 14:33:50 +08:00
jiangpch
7d79202c4d Remove image_driver_list in zun.conf
We should use the default value for image_driver_list to support
both glance and docker images.

Change-Id: I123fce57cdbd7d154d70aa8d171f946f74dd4e2f
2017-08-02 22:26:28 -04:00
Jenkins
f21d954179 Merge "Add default volume_backend_name for rbd driver in cinder volume" 2017-08-02 07:15:38 +00:00
Jenkins
1ab6822d99 Merge "Stop and start container rather than use restart directly" 2017-07-31 13:12:38 +00:00
Jenkins
e3f1f1fa01 Merge "Assume the container is removed if it is not show in docker ps" 2017-07-31 09:37:44 +00:00
Jenkins
8f58211319 Merge "Fixes horizon reconfigure for adding custom *_policy.json files" 2017-07-30 02:25:09 +00:00
Sam Yaple
c18615efd5 Remove priviledged mode for nova-api
This only existed to add an iptables rule for nova-net related things.

Change-Id: I4e6c50d0908edde3b3cc68382f4466a828f377a5
Related-Bug: #1687187
2017-07-28 12:43:34 -04:00
Michal Nasiadka
141dbc8f14 Fixes horizon reconfigure for adding custom *_policy.json files
Change-Id: I2d9fca7d4272c69c75b106ac4cea244a371d3b5f
Closes-bug: #1707163
2017-07-28 13:09:19 +02:00
Jeffrey Zhang
ea1ae405ba Assume the container is removed if it is not show in docker ps
In some case, docker can not remove container and raise following error
message:

    Unable to remove filesystem for xxx remove
    /var/lib/docker/containers/xxx/shm: device or resource busy

But the container is removed. This patch assumes container is
removed if only container name is not shown in docker ps.

Closes-Bug: #1662598
Change-Id: I079d5ec6178018403ec7a49c975f137e27eb9ad4
2017-07-28 17:30:11 +08:00
Jeffrey Zhang
7f2ade5b5a Stop and start container rather than use restart directly
Docker has an issue[0] when restart container. But stop then start
works.

[0] https://github.com/moby/moby/issues/29704

Change-Id: If0a9c0c257cd72209be8e138a1f0b8871500e089
Closes-Bug: #1707097
2017-07-28 17:26:27 +08:00
Jenkins
e9c4a5877d Merge "Use a separate user for ceph-rgw rather than keystone admin user" 2017-07-27 14:47:08 +00:00
Jenkins
6c144946fa Merge "Only start one glance_api when using file backend" 2017-07-27 09:41:44 +00:00
Jenkins
06046f3943 Merge "Unified Apache access log format" 2017-07-27 09:30:53 +00:00
Jeffrey Zhang
1cf116cd6c Use a separate user for ceph-rgw rather than keystone admin user
If not, change admin user password will break ceph rgw service.

Change-Id: Ia872f6f1aa2d9917d3f5851e0edcffed61e71355
Closes-Bug: #1705929
2017-07-27 16:41:41 +08:00
Kuo-tung Kao
20595eb838 copy cinder_backup keyring from cinder_backup
keyring should copy from cinder_backup folder when using external ceph

Change-Id: Ic7c5532355eed1fa1362f84f5c2691f698d5792a
Closes-Bug: 1703733
2017-07-27 16:36:13 +08:00