Updated openstack/openstack
Project: openstack/trove  03be3a843f6736b8318e8817947662269411f0aa

Fix enable on boot when working with systemd and symlinked units

mysql on Fedora20 is actually mariadb and /usr/lib/systemd/system/mysqld.service
is a symbolic link to /usr/lib/systemd/system/mariadb.service. systemctl "enable"
doesn't work on symlinked inits like described in:

https://bugzilla.redhat.com/1014311

So in order to enable mysqld service properly in this case we need to
replace a service name with the real path to service file.

Closes-Bug: #1330937
Change-Id: Id823b3e377c4d0d5f1e5452fad9826232bc1f904
Updated openstack/openstack
Project: openstack/python-saharaclient  f761cea538fa7842c0b9da500b6ca982c0e43151

Remove vim editor configuration from comments

This patch removes vim editor configuration from comments.

Cherry-pick: Iff22b6337f333e1b43f8982d3e0208a9e317bd60 from sahara.
Change-Id: I2a973aeaf694ae81f09c82490d24566c25db4194
Partial-Bug: #1229324