4928 Commits

Author SHA1 Message Date
Zuul
ea702e26fa Merge "Fix kolla-docker possible undefined variable" 2019-03-11 11:17:32 +00:00
Gary Perkins
958efcef73 Fix Neutron precheck to not fail with newer Docker
With newer Docker versions `systemctl show docker` returns:

  MountFlags=shared

Instead of:

  MountFlags=1048576

This fix accepts either value as valid to ensure the check is not
erroneously failing.

Closes-Bug: #1791365

Change-Id: I2bd626466d6a0e189e0d85877b2be8f2b4bb37f4
2019-03-11 11:15:13 +00:00
Victor Coutellier
3bb4c19981 Fix kolla-docker possible undefined variable
It is possible to reference undefined variable in kolla-docker module if
DockerWorker object initialization fail, so the current behaviour will
crash the playbook with the unwanted error message :

UnboundLocalError: local variable 'dw' referenced before assignment

Change-Id: Ic8d26b11f93255220888b5406f8ab4a6f81736c2
Closes-Bug: #1819361
2019-03-10 19:13:00 +01:00
Duong Mai
2519451696 Edit ansible script for deploy kibana
Kibana deployment failed becaused of kibana_confs variable does not have attribute key,
So handlers failed to check conditional kibana_conf.changed | bool becaused of
kibana_confs.results|selectattr(item.key) does not exits.

Change variable name kibana_confs to kibana_conf.

Change-Id: If5e0a25b270a6f05c435a6dc32e2ac49406389c5
Closes-Bug: #1819246
2019-03-09 11:46:04 +07:00
Mark Goddard
1b5353593c Fix bootstrap-servers on Ansible 2.6+
Recently as part of adding support for Docker CE we added the following
task to the baremetal role:

- name: Update yum cache
  yum:
    update_cache: yes
  become: True
  when: ansible_os_family == 'RedHat'

This works fine on Ansible 2.5, but no longer works on Ansible
2.6, which complains that either the 'name' or 'list' argument
is mandatory for the yum module.

This change updates the cache later on, when installing packages.

Change-Id: I1a158bda52c4e362cb12d361d7f961cfc699b385
Closes-Bug: #1819173
2019-03-08 14:36:08 +00:00
Doug Szumski
e5d564136b Fix format file message field
The message field for these format files wasn't renamed when
the input field was renamed. This problem was masked by Monasca
which renames the message field back to 'message' for the Fluentd
Monasca output plugin.

Change-Id: I2674958b1e64efddbca4765fefa55431261648e6
Closes-Bug: #1819168
2019-03-08 14:10:26 +00:00
Doug Szumski
c8a22f1090 Support customising Fluentd formatting
In some scenarios it may be useful to perform custom formatting of logs
before forwarding them. For example, the JSON formatter plugin can be
used to convert an event to JSON.

Change-Id: I3dd9240c5910a9477456283b392edc9566882dcd
2019-03-08 11:20:33 +00:00
Bai Yongjun
ed2fd243d1 Add cyborg to kolla-ansible
Because kolla-ansible not have cyborg so should add it.

Implements: blueprint add-cyborg-to-kolla-ansible

Depend-On: I497e67e3a754fccfd2ef5a82f13ccfaf890a6fcd

Change-Id: I6f7ae86f855c5c64697607356d0ff3161f91b239
2019-03-08 10:46:53 +08:00
Michal Nasiadka
f637d139d2 Fix tempest.conf permissions
Currently permissions are set to be root, but tempest runs as 'tempest'
user - and gets permission denied.

Change-Id: Ia3a8a2e780f95c6aa16a9d2483d987322741cfbf
2019-03-07 15:50:41 +01:00
Zuul
e098d95eac Merge "Allow swift proxy server to use independent hostnames" 2019-03-07 12:44:57 +00:00
Zuul
8ccd55339a Merge "Allow senlin services to use independent hostnames" 2019-03-07 12:44:55 +00:00
Zuul
20ccebbe4b Merge "Allow octavia services to use independent hostnames" 2019-03-07 12:44:53 +00:00
Zuul
ceaccca82f Merge "Allow barbican services to use independent hostnames" 2019-03-07 12:44:51 +00:00
Zuul
0981eac031 Merge "Allow designate services to use independent hostnames" 2019-03-07 12:44:49 +00:00
Zuul
3a173ac1b7 Merge "Allow cinder services to use independent hostnames" 2019-03-07 12:44:48 +00:00
Zuul
372609dca3 Merge "Use keystone_*_url var in all configs" 2019-03-07 12:26:26 +00:00
Zuul
cb648f7816 Merge "Restart containers when ceph.conf changed" 2019-03-07 11:34:00 +00:00
Zuul
4dbbc0e7e0 Merge "Added ability to skip enabled backends pre-check" 2019-03-07 10:33:46 +00:00
Zuul
6aa07e3f41 Merge "Deploy Sahara with unversioned endpoints" 2019-03-07 10:11:13 +00:00
Doug Szumski
d46635598d Remove redundant copying of Fluentd input files
These files are copied by the wildcard which proceeds it.

Change-Id: I27dc7797db705f025c3a312cb9e9c577342ea06f
2019-03-07 10:06:50 +00:00
Arkadiy Shinkarev
1d9f4f9ff1 Added ability to skip enabled backends pre-check
When using custom storage backends with cinder.conf overrides file,
precheck stage in kolla-ansible is fail. This commit adds option
'skip_cinder_backend_check' (default: False) to cinder role.

Change-Id: Ifee138ad8b281903ea2365441aada044c80c46f0
2019-03-07 10:27:41 +03:00
Jim Rollenhagen
3ee1a7ce3c Allow horizon listening port to be different than reachable port
This adds a horizon_listen_port option, which defaults to horizon_port
for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I1e47e9524fd9c41bbb2cd2fc80560e53d9296599
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
f8a1a716ac Allow gnocchi services to use independent hostnames
This allows gnocchi service endpoints to use custom hostnames, and adds the
following variables:

* gnocchi_internal_fqdn
* gnocchi_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a gnocchi_api_listen_port option, which defaults to
gnocchi_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: Ic9a0f8130b19ed77987f45fd0e824b82ea7a7328
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
1ebb1ccee2 Allow aodh services to use independent hostnames
This allows aodh service endpoints to use custom hostnames, and adds the
following variables:

* aodh_internal_fqdn
* aodh_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a aodh_api_listen_port option, which defaults to
aodh_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: Iee08b725d066bfbe543d9319c47941d59c22212a
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
d0fc1ec278 Allow heat services to use independent hostnames
This allows heat service endpoints to use custom hostnames, and adds the
following variables:

* heat_internal_fqdn
* heat_external_fqdn
* heat_cfn_internal_fqdn
* heat_cfn_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds heat_api_listen_port and heat_api_cfn_listen_port
options, which default to heat_api_port and heat_api_cfn_port for
backward compatibility.

These options allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: Ifb8bb55799703883d81be6a55641be7b2474fd4e
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
d1d1837c25 Allow ironic services to use independent hostnames
This allows ironic service endpoints to use custom hostnames, and adds the
following variables:

* ironic_internal_fqdn
* ironic_external_fqdn
* ironic_inspector_internal_fqdn
* ironic_inspector_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds ironic_api_listen_port and ironic_inspector_listen_port
options, which default to ironic_api_port and ironic_inspector_port for
backward compatibility.

These options allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I45b175e85866b4cfecad8451b202a5a27f888a84
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
31ed556e67 Allow swift proxy server to use independent hostnames
This allows swift service endpoints to use custom hostnames, and adds the
following variables:

* swift_internal_fqdn
* swift_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a swift_proxy_server_listen_port option, which defaults to
swift_proxy_server_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

While we're in here, use the ``internal_protocol`` variable for the swift
endpoint in cinder's swift backup driver configuration, instead of hardcoding
to ``http``.

Change-Id: Ibc01618383c26e16c0067f7f6b9cf5160d968d1e
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
b6c31862af Allow senlin services to use independent hostnames
This allows senlin service endpoints to use custom hostnames, and adds the
following variables:

* senlin_internal_fqdn
* senlin_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a senlin_api_listen_port option, which defaults to
senlin_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I26e8cfdde54aaf0648473f54136cf5350f356917
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
55702739d0 Allow octavia services to use independent hostnames
This allows octavia service endpoints to use custom hostnames, and adds the
following variables:

* octavia_internal_fqdn
* octavia_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a octavia_api_listen_port option, which defaults to
octavia_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I1310eb5573a469b1a0e9549e853734455307a8b3
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
857871df00 Allow barbican services to use independent hostnames
This allows barbican service endpoints to use custom hostnames, and adds the
following variables:

* barbican_internal_fqdn
* barbican_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a barbican_api_listen_port option, which defaults to
barbican_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I1807a9c8b64d737d0e278bb3e925fecb4fadfb08
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
76b6d41e51 Allow designate services to use independent hostnames
This allows designate service endpoints to use custom hostnames, and adds
the
following variables:

* designate_internal_fqdn
* designate_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a designate_api_listen_port option, which defaults to
designate_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I654bb3d1109b96cbaff6f450655cd65f349a94e6
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
45bde4b9b3 Allow cinder services to use independent hostnames
This allows cinder service endpoints to use custom hostnames, and adds the
following variables:

* cinder_internal_fqdn
* cinder_external_fqdn

These default to the old values of kolla_internal_fqdn or
kolla_external_fqdn.

This also adds a cinder_api_listen_port option, which defaults to
cinder_api_port for backward compatibility.

This option allow the user to differentiate between the port the
service listens on, and the port the service is reachable on. This is
useful for external load balancers which live on the same host as the
service itself.

Change-Id: I2a5036456afac6135dca3723ae754ea9f8bc8475
Implements: blueprint service-hostnames
2019-03-06 15:08:28 -05:00
Jim Rollenhagen
2e4e60503a Use keystone_*_url var in all configs
We're duplicating code to build the keystone URLs in nearly every
config, where we've already done it in group_vars. Replace the
redundancy with a variable that does the same thing.

Change-Id: I207d77870e2535c1cdcbc5eaf704f0448ac85a7a
2019-03-06 15:08:26 -05:00
Zuul
98e5415722 Merge "Allow keystone services to use independent hostnames" 2019-03-06 17:06:24 +00:00
Zuul
b3f1a71d0b Merge "Allow neutron services to use independent hostnames" 2019-03-06 17:06:22 +00:00
Zuul
38bd9fde2a Merge "Allow glance services to use independent hostnames" 2019-03-06 16:52:18 +00:00
Zuul
a2975ef592 Merge "Improve standalone ironic support" 2019-03-06 09:03:31 +00:00
Zuul
b6f1ffcc72 Merge "Update arguments for starting Prometheus exporters" 2019-03-04 16:31:39 +00:00
Zuul
d8410f0805 Merge "Use prometheus tag for OpenStack exporter" 2019-03-04 12:23:17 +00:00
Zuul
a628deefc1 Merge "Use new cinder target_helper option" 2019-03-04 12:09:39 +00:00
ZhongShengping
008e2b15ec Deploy Sahara with unversioned endpoints
Sahara supports unversioned endpoint also for the current API v1.1,
and deploying with unversioned endpoints is a better setting
if people want to use both API v1.1 and the (soon-stable) API v2
at the same time.
See https://review.openstack.org/#/c/582285/ for more details.

Change-Id: I0f3ed4674f9629963e0a10118ad5d9b194fd4661
Closes-Bug: #1782147
2019-03-04 14:11:16 +08:00
wu.chunyang
7d9cb44d1f Restart containers when ceph.conf changed
When ceph.conf changed, we need restart some containers.

Change-Id: Iddeaf9dd4f288165fcef288e5384d79b61a0910b
Closes-Bug: #1810010
2019-03-02 16:22:24 +08:00
Zuul
ed4133b41f Merge "Fix rabbitmq reconfigure, simplify role" 2019-03-01 17:16:10 +00:00
Zuul
d45d940fe5 Merge "Use become for Cinder LVM precheck" 2019-03-01 17:16:09 +00:00
Zuul
390c4d6454 Merge "Optimize reconfigure action for iscsi" 2019-03-01 15:41:05 +00:00
Mark Goddard
1c22da32ff Use new cinder target_helper option
The iscsi_helper option was deprecated in favour of target_helper in
Queens, and will be removed in the Stein release.

This also renames the cinder_iscsi_helper variable to
cinder_target_helper, deprecating but still supporting the former name
until the Train release.

Change-Id: Ie38c09b2dd8598f62b0733c8444eec5f6ce3daac
2019-03-01 14:36:25 +00:00
Mark Goddard
280761394c Use become for Cinder LVM precheck
Typically root privileges are required to access LVM.

Change-Id: Ia8cca7326526326486c4495e4ddfe126c7251448
2019-03-01 14:34:53 +00:00
Doug Szumski
e8f6a4aa14 Use prometheus tag for OpenStack exporter
Change-Id: Idd570626851c068b9a2daf3f1550346d419f9c9b
2019-03-01 12:45:40 +00:00
Doug Szumski
a55769b00a Update arguments for starting Prometheus exporters
The patch that this depends on in the Kolla repo updates various Prometheus
exporters. In some cases the command line syntax has changed which prevents
them from starting. This commit updates the command line syntax in-line with
the new versions.

Depends-On: I846989b16fa7f76b11b309b7a9764cec8aaf538d
Change-Id: I1c8c56059e51442d7bf2248b9632021cb529b4ba
2019-02-28 09:41:32 +00:00
Doug Szumski
4aed04409b Default to Prometheus tag for all Prometheus images
This allows an operator to pin the Prometheus docker image
tag for all Prometheus images to that specified by the `prometheus_tag`.
Without this change, the alert manager and cadvisor tags would also need
to be set.

Change-Id: Iadef001af7d3be5b2a39ce5e2363d05a33a775e4
2019-02-27 13:59:46 +00:00