8894 Commits

Author SHA1 Message Date
Zhangfei Gao
ce809aea23 osprofiler support redis
Currently osprofiler only choose elasticsearch,
which is only supported on x86.
On other platform like aarch64 osprofiler can
not be used since no elasticsearch package.

Enable osprofiler by enable_osprofiler: "yes",
which choose elasticsearch by default.
Choose redis by enable_redis: "yes" & osprofiler_backend: "redis"
On platform without elasticsearch support like aarch64
set enable_elasticsearch: "no"

Change-Id: I68fe7a33e11d28684962fc5d0b3d326e90784d78
2018-06-01 09:34:04 +08:00
Zuul
9568f1c790 Merge "Fix Nova authentication in Cinder configuration file" 2018-05-31 11:58:42 +00:00
Zuul
1b55a093dc Merge "Adds parameter to configure HAProxy defaults balance" 2018-05-31 11:49:58 +00:00
Zuul
ffa5e57f20 Merge "Add support for enabling ipxe boot with ironic" 2018-05-31 11:37:52 +00:00
Zuul
360f2b9464 Merge "Add custom option for docker" 2018-05-31 11:15:40 +00:00
Kevin Tibi
b6bab5b931 Add custom option for docker
Some options can't be add in the daemon.json
The only way to configure daemon is to add option in the service file

Change-Id: I88697951ed6518f62bca30bb52288ad0e487ec03
2018-05-30 17:45:27 +02:00
Zuul
e858650006 Merge "Add cAdvisor for Prometheus monitoring" 2018-05-30 15:05:16 +00:00
Zuul
1336b5e6c8 Merge "Mariadb bootstrap_cluster enhancement" 2018-05-30 13:23:34 +00:00
Zuul
759e4ae634 Merge "check cron container error" 2018-05-30 11:34:02 +00:00
Zuul
2b61d9bf8c Merge "Put upper limit on cmd2 in kolla-toolbox" 2018-05-30 10:16:07 +00:00
Zuul
ed3aff41ee Merge "To avoid creating empty volume for heat" 2018-05-30 09:50:14 +00:00
Jeffrey Zhang
4ab76ed9e1 Put upper limit on cmd2 in kolla-toolbox
This fixes an issue with cmd2 >= 0.9.0 requiring python3.

Change-Id: I5f88f0b0540785f8e7b7ab7c5252c6a51f314922
Closes-Bug: #1773938
2018-05-30 16:00:58 +08:00
MinSun
bee02d36a0 Mariadb bootstrap_cluster enhancement
Using mariadb service defined in default when boot bootstrap_mariadb
Not a bug here, just an enhancement.

Change-Id: I1f8b51fb6177a8524483e600701924dbfc3403cb
2018-05-30 10:49:38 +08:00
MinSun
2e123aedc7 check cron container error
In common role, when check common container for cron restart,
we should use cron_container.changed instead of
check_common_containers.changed

Change-Id: Ifaaa437f5e205e970371fbb3660b68df352eb440
Closes-Bug: #1773923
2018-05-30 09:01:25 +08:00
Zuul
295f6c7ee7 Merge "Remove keystone_authtoken section for aodh" 2018-05-29 15:31:21 +00:00
Mark Giles
41254b6c46 Add cAdvisor for Prometheus monitoring
cAdvisor (Container Advisor) provides metrics on resource usage and
performance characteristics of running containers.  This change
deploys a cadvisor container and configures prometheus to scrape
data from it.

Change-Id: I55dd4fee954f9be68efda397746861ddaaa0a565
Partially-Implements: blueprint prometheus
2018-05-29 08:55:58 -04:00
Zuul
9fcdefb834 Merge "fix a typo" 2018-05-29 09:52:30 +00:00
zhulingjie
f8fd06011a Remove keystone_authtoken section for aodh
1. Now, the aodh use [service_credentials] to get credentials[0],
remove the unused [keystone_authtoken]
2. Move memcache stuff into service_credentials section

refer to https://review.openstack.org/#/c/570393/

Change-Id: I08cf3ec4e9ca32cc83d74bd4204e7e170b01feb7
2018-05-29 09:24:34 +00:00
Zuul
0a3fe3ee86 Merge "Remove duplicated content" 2018-05-29 06:57:23 +00:00
Zuul
544deed69f Merge "Update the supermark for Kolla-ansible link" 2018-05-29 06:52:28 +00:00
Zuul
86c6773981 Merge "Update the freezer services link" 2018-05-28 02:32:15 +00:00
Zuul
b4de44b8be Merge "[elasticsearch] Change ES_HEAP_SIZE to ES_JAVA_OPTS." 2018-05-27 20:30:43 +00:00
ZhijunWei
b3b0d28eb6 To avoid creating empty volume for heat
1. when set heat_dev_mode to no, the volume will be empty[0],
this ps to avoid creating empty volume.

[0]: https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/heat/defaults/main.yml#L13

Change-Id: Id22469442a4713f53646ffec2c5a960722fccb44
2018-05-26 03:37:25 +00:00
Will Szumski
0a1ccc2612 Add support for enabling ipxe boot with ironic
When enable_ironic_ipxe is set in /etc/kolla/globals.yml,
the following happens:

- a new docker container, ironic_ipxe, is created. This contains
  an apache webserver used to serve up the boot images
- ironic is configured to use ipxe

Change-Id: I08fca1864a00afb768494406c49e968920c83ae7
Implements: blueprint ironic-ipxe
2018-05-25 08:20:47 +00:00
chenxing
38d5ee66cb Remove duplicated content
Change-Id: I0e8b4b443a0659e75a80de1dd1f6418ff2793d2f
Closes-Bug: #1771257
2018-05-25 15:10:34 +08:00
Jorge Niedbalski
3b61cc702d [prometheus] Add memcached_exporter.
This patch adds the prometheus_memcached_exporter[0] to the
list of  available exporters, following the conventions
used by the previously integrated exporters.

[0] https://github.com/openstack/kolla/tree/master/docker/prometheus-memcached-exporter

Change-Id: I103b0ee19ef2fd17ce19a27d60773675ad234c1c
Closes-Bug: #1773303
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
2018-05-25 01:45:13 -04:00
Zuul
f602007148 Merge "nova: make libvirt port configurable and check if the port is free" 2018-05-24 15:11:18 +00:00
Nikita Gerasimov
418a6c8896 Adds parameter to configure HAProxy defaults balance
Introduce new option "haproxy_defaults_balance" to set balance in
defaults section.

Change-Id: Iaf12717ffac94ac2308758bd8ec87f088af26b69
Closes-Bug: #1773178
2018-05-24 17:47:05 +03:00
wu.chunyang
16c4ccc762 fix a typo
"clausule" is dutch,should be "Clause"

Change-Id: I0c92b26db0876ce3622b67317b7f0bd85564e881
2018-05-24 12:55:03 +00:00
Zuul
3849fbc5f6 Merge "Remove keystone_authtoken section for vitrage" 2018-05-24 12:18:13 +00:00
Zuul
c100c135bd Merge "fix blazar error in deployment" 2018-05-24 11:23:11 +00:00
Zuul
7e010bdfd0 Merge "Updated genpwd to work with python35" 2018-05-23 17:07:48 +00:00
Vladislav Belogrudov
8af7372c3d Fix Nova authentication in Cinder configuration file
Cinder requires access to Nova during Nova assisted backups and
snapshots. Both fail without proper Nova authentication section
in cinder.conf file.

Change-Id: I5d1fc3b466bf2df919e426d2052c1ee31c27030d
Closes-Bug: #1772959
2018-05-23 20:04:44 +03:00
Zuul
913e6572c1 Merge "horizon: allow to configure by custom_local_settings.j2" 2018-05-23 08:16:26 +00:00
ZhijunWei
e180a98094 Remove keystone_authtoken section for vitrage
1. Now, the vitrage use [service_credentials] to get credentials[0],
remove the unused [keystone_authtoken]
2. Move memcache stuff into service_credentials section

[0]: 5c4bd36e80/vitrage/opts.py (L56)

Change-Id: Id22e59ff572a2fef08906bf6cc48578981d2efd6
2018-05-23 07:06:17 +00:00
Borne Mace
f1768ef7ab Updated genpwd to work with python35
Due to the changes in hmac.new and how binary strings
are dumped in yaml.safe_dump some changes were needed to
make sure that we dumped only strings, not binary strings.

Change-Id: Ic2fbcf2347023c1e9e666203dfe40dbeaf24ce5f
2018-05-22 16:33:40 -07:00
wu.chunyang
373416658a fix blazar error in deployment
when deploy this project,it report an error "
blazar_policy_jsons" not found, which result in
faild. this ps to fix it

Change-Id: Ifa4c0f33642e355be8849f2298d4a73c5e6c602c
2018-05-22 14:18:38 +00:00
Jorge Niedbalski
a9693b85ac [elasticsearch] Change ES_HEAP_SIZE to ES_JAVA_OPTS.
After enabling the elasticsearch debian/ubuntu
images the container doesn't starts with ELK 5.4.1
as ES_HEAP_SIZE has been deprecated.

We should use ES_JAVA_OPTS with the -Xms/Xmx options instead.

Closes-Bug: #1772482

Change-Id: I9b368468d41421d679a9c4ad6fdf595863de7a1a
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
2018-05-21 15:39:53 -04:00
Zuul
2ca94a62d1 Merge "Update the deprecated vnc options" 2018-05-21 15:32:53 +00:00
Zuul
44465b6832 Merge "Fix the permissions of mgr and mds keyring" 2018-05-21 15:32:29 +00:00
Zuul
1dbe6a77ca Merge "Optimise the tag for common role" 2018-05-21 15:20:51 +00:00
Zuul
db5c1bd2e9 Merge "Add congress-dashboard into Horizon" 2018-05-21 14:12:54 +00:00
Zuul
c4788d6201 Merge "Remove old upgrade task from Ceilometer" 2018-05-21 14:12:53 +00:00
Zuul
fe30613497 Merge "Remove the unnecessary register.yml for upgrade" 2018-05-21 14:07:57 +00:00
Zuul
e38d95def5 Merge "Support deploying the Monasca Log API" 2018-05-21 13:53:34 +00:00
Zuul
c3cd8ae6fc Merge "Adding ironic_dnsmasq_boot_file parameter to globals.yml" 2018-05-21 11:28:20 +00:00
Doug Szumski
eab66ab02e Support deploying the Monasca Log API
Deploys the Monasca Log API with mod_wsgi + Apache.

Change-Id: I28f0aa31c59b0b6917be2b125b5f8a0d7a7035af
Partially-Implements: blueprint monasca-roles
2018-05-21 12:05:58 +01:00
Zuul
a672d4e730 Merge "Support deploying the Monasca API" 2018-05-21 11:05:54 +00:00
Doug Szumski
c11f9f521d Support deploying the Monasca API
Deploys the Monasca API with mod_wsgi + Apache.

Co-Authored-By: Mark Goddard <mark@stackhpc.com>

Partially-Implements: blueprint monasca-roles
Change-Id: I3e03762217fbef1fb0cbff6239abb109cbec226b
2018-05-21 09:28:13 +00:00
Zhangfei Gao
4eaf397023 Adding ironic_dnsmasq_boot_file parameter to globals.yml
By now, ironic-dnsmasq has default bootfile pxelinux.0,
which is correct only for x86.
Adding ironic_dnsmasq_boot_file parameter to globals.yml
to make it configuable.
For example: /etc/kolla/globals.yml
ironic_dnsmasq_boot_file: "debian-installer/arm64/bootnetaa64.efi"

Change-Id: I6eb57702d4dad549ef8c999c1c82e577f316d8d6
2018-05-21 08:35:59 +00:00