Commit Graph

146 Commits (66126c2a774cc9f35f40c5d8400738d0e5a6a36d)

Author SHA1 Message Date
wangjiaqi07 66126c2a77 remove unicode from code
Change-Id: If44e9324df8b1cfc358ae3e378617a19f7c2de12
2022-08-25 14:22:36 +08:00
Goutham Pacha Ravi 8cd2097190 Switch ubuntu image to Jammy Jellyfish
Move to the 22.04 LTS release. Also stop installing
python2, since its EOL.

Depends-On: Idd3e6a6fdb8cf13727cd674c76efd89b3aacfc52
Change-Id: I9b4c134ecc9279487e253fa3bc38ae32fe487ac6
Signed-off-by: Goutham Pacha Ravi <>
2022-06-09 12:33:49 +00:00
Goutham Pacha Ravi a21683502a Fix and setup.cfg deprecations
This project cannot be "installed" as a python package,
so specify there are no "py_modules" to install; alongside,
hyphenated metadata headers are deprecated in setup.cfg, replace them.

Change-Id: I0713f3c871180ea235c12f888e43a7a823341f0c
Signed-off-by: Goutham Pacha Ravi <>
2022-04-05 21:15:39 +05:30
George Melikov 631a8542df Allow to set MANILA_USER_AUTHORIZED_KEYS
It may be appropriate to easily add keys for SSH auth.

Change-Id: I7c7875fa1e6c2228d2268f6c26994d12a0a5262e
Signed-off-by: George Melikov <>
2021-08-12 17:05:10 +03:00
George Melikov 156d9e370b Fix typo for manilauser-ssh-authorized-keys
Change-Id: I481f822f3de873754737e5805bce2766cb37434c
2021-08-12 17:04:55 +03:00
George Melikov 93957d68ef Allow empty MANILA_PASSWORD to harden security
There is a check for empty value of
`elements/manila-ssh/install.d/50-manila-user` already.

Just allow to set MANILA_PASSWORD empty.

Change-Id: I08ee3e643bb0c6208bda7caadc11f865617163f3
Signed-off-by: George Melikov <>
2021-08-10 13:26:31 +03:00
Zuul 9c00e86d17 Merge "Add OpenLDAP to manila-docker-container" 2021-03-09 13:19:32 +00:00
Eduardo Santos b9e4bd6b73 Add OpenLDAP to manila-docker-container
This patch adds an OpenLDAP server and some LDAP utilities to the
manila-docker-container Docker image. It modifies the Dockerfile so it installs
the ``slapd`` and ``ldap-utils`` packages, calls the shell script,
which configures slapd, and makes the container start slapd automatically when

Change-Id: I56995cff4457a2cbfbf42a86ee45c75a259f41e5
2021-03-09 03:51:49 +00:00
Eduardo Santos 6496b2f2ba Remove lower-constraints job
This patch removes the lower-constraints job entirely. This change
is needed due to an update in the pip-dependency-resolver which
broke the lower-constraints job.

Change-Id: Ie97fec3d6edf93a1506a38ead8a17534e6bb0ccd
2021-03-04 17:40:19 +00:00
Zuul d6220444fd Merge "Ignore *.service files when linting bash scripts" 2020-08-17 17:36:01 +00:00
Goutham Pacha Ravi 7725e2cbbf Ignore *.service files when linting bash scripts
Prevents this bashate warning:

./elements/manila-ssh/install.d/fetch-public-ssh-keys.service:1:1: E005 File does not begin with #! or have .sh prefix


Change-Id: I9e4e6b96730ddc62ac1094ec4af0c84863acc60f
Signed-off-by: Goutham Pacha Ravi <>
2020-07-29 13:24:37 -07:00
Goutham Pacha Ravi f780218341 Switch ubuntu image to Focal Fossa (20.04 LTS)
Test infrastructure is moving to Focal Fossa
in this release, the service image could too.

Change-Id: I89ff01d31012633a2cefd6ef453530c011ff8a09
Signed-off-by: Goutham Pacha Ravi <>
2020-07-29 10:43:11 -07:00
Zuul d9d2f16360 Merge "Native Zuulv3 container scenario test job" 2020-07-25 11:39:47 +00:00
Zuul 344ea15972 Merge "Native Zuulv3 scenario test job" 2020-07-25 11:38:51 +00:00
Goutham Pacha Ravi 6a026e72b4 Native Zuulv3 container scenario test job
Replace the "manila-tempest-dsvm-container-scenario-custom-image"
job with a native Zuulv3 style job that does not use
the deprecated devstack-gate project. This new test
job runs backend tests at the moment with the container
driver. Scenario tests that include mounting shares to
tenant VMs aren't yet enabled, and doing so is a TODO
item for the future.

Change-Id: I65379ffcf06e9de111d69cd3b5bc4acc7af0547e
Signed-off-by: Goutham Pacha Ravi <>
2020-07-23 23:42:15 -07:00
Goutham Pacha Ravi 873527d746 Native Zuulv3 scenario test job
Replace the "manila-tempest-dsvm-generic-scenario-custom-image"
job with a native Zuulv3 style job that does not use
the deprecated devstack-gate project. This new test
job runs integration NFS and CIFS tests against a newly
created test image that is used as the service
instance image, as well as the client image.

Change-Id: I3d2345e80f3bc18558d4cc6cc58108ff63119460
Signed-off-by: Goutham Pacha Ravi <>
2020-07-23 22:20:34 -07:00
Zuul 207e43a9aa Merge "Start ssh only after full boot" 2020-07-22 23:57:21 +00:00
George Melikov bc5e37ffd9 Start ssh only after full boot
Before this change instance may close ssh connection on boot with message:

"System is booting up. See pam_nologin(8)"
Connection closed by XXX port 22

, so manila think that password/private key is wrong and fails share creation.

Closes-bug: #1888569
Change-Id: I032e77e2f16e1d445c72eb3abd99a09c413dabe5
Signed-off-by: George Melikov <>
2020-07-22 20:48:54 +00:00
George Melikov 8d0a0e8a52 Install qemu-quest-agent
It's needed for some cases (fox ex. online disk resize)

Change-Id: I136b46ea8f6f1630eb5691e9b6eeadcc92dd6197
Signed-off-by: George Melikov <>
2020-07-22 01:15:31 +03:00
Goutham Pacha Ravi 9f1a542e44 Ensure tox in test job
We use tox to build images, and it is
no longer being included in the base
job that we depend on.

Change-Id: I608d380f2347efe8615c5ff3ae157f27bbfbf497
Signed-off-by: Goutham Pacha Ravi <>
2020-07-20 12:51:32 -07:00
Zuul 2859569635 Merge "Change DHCP timeout" 2020-06-04 23:19:22 +00:00
Andreas Jaeger e5ae79051f Switch to newer openstackdocstheme version
Switch to openstackdocstheme 2.2.1 version. Using
this version will allow especially:
* Linking from HTML to PDF document
* Allow parallel building of documents
* Fix some rendering problems

Update Sphinx version as well.

Change pygments_style to 'native' since old theme version always used
'native' and the theme now respects the setting and using 'sphinx' can
lead to some strange rendering.

openstackdocstheme renames some variables, so follow the renames
before the next release removes them. A couple of variables are also
not needed anymore, remove them.

See also

Change-Id: Id7a2401cd31c0b05812a76d2cc5f1e6a014cb510
2020-05-31 17:53:48 +02:00
Goutham Pacha Ravi f75519fba5 Refactor cephfs element
DIB ignores a plain "install.d" directive
silently currently, producing images without
the packages we asked for.

Use the "package-installs" approach to install
element dependencies. No configuration is added
at the moment, but may be required in the future.

Also install the "fuse" package to get the ability
to execute "fusermount" command.

Change-Id: Ifbd7344b20940575348a856521539425b34a4279
Signed-off-by: Goutham Pacha Ravi <>
2020-05-26 22:43:25 -07:00
George Melikov 1d9010cdb8 Change DHCP timeout
Manila service network may be large and dnsmasq
may be available slower than in 60 seconds.

Change-Id: I27e625ecccec0b7294bf0022f11bbd36d8ace5b4
Signed-off-by: George Melikov <>
2020-05-26 17:17:35 +03:00
Zuul 0f8e60eee5 Merge "Modify job to build images" 2020-05-22 17:21:00 +00:00
Goutham Pacha Ravi a833b762d7 Modify job to build images
We currently only build the generic driver
image with the job "manila-image-elements-buildimage-generic".
Since we'd like to use a cephfs based client image,
we can reuse the job to produce two images instead
of one. The new job "manila-image-elements-buildimages"
produces two images: "manila-service-image-cephfs-{tag}.qcow2"
and "manila-service-image-{tag}.qcow2"; where the
tag corresponds to the version of this project.

The job also creates a soft link of the tagged images
with a "-master" suffix instead of the tag - this
is useful for CI jobs that don't need to worry
about changing/using the latest tag.

Change-Id: I60c6b38b5d5de7649c0d760519a79288fafca1e3
Signed-off-by: Goutham Pacha Ravi <>
2020-05-21 15:44:12 -07:00
Zuul 4508f1fa8d Merge "Pass env vars into tox buildimage sections" 2020-05-20 17:48:34 +00:00
George Melikov 685e79ab0f README: add example for variable override
Change-Id: Ic63b298a185e7493032b6b59943db8e8bd42b18c
Signed-off-by: George Melikov <>
2020-05-20 12:55:52 +03:00
George Melikov 36584b81dd Pass env vars into tox buildimage sections
Change-Id: Ia447d5fef7dd09ad6a68c6516a07306f314247e1
Signed-off-by: George Melikov <>
2020-05-20 12:54:52 +03:00
Zuul 73524efb43 Merge "Fix hacking min version to 3.0.1" 2020-05-15 19:47:09 +00:00
Ghanshyam Mann 601b450cf9 Fix hacking min version to 3.0.1
flake8 new release 3.8.0 added new checks and gate pep8
job start failing. hacking 3.0.1 fix the pinning of flake8 to
avoid bringing in a new version with new checks.

Though it is fixed in latest hacking but 2.0 and 3.0 has cap for
flake8 as <4.0.0 which mean flake8 new version 3.9.0 can also
break the pep8 job if new check are added.

To avoid similar gate break in future, we need to bump the hacking min

Also removing the hacking and other related dep from lower-constraints file
as theose are blacklisted requirements and does not need to be present


Change-Id: I475765d76453590c47de84809fd51433d4577c76
2020-05-15 11:42:04 -05:00
lkuchlan fa2177bdf6 Add support for CephFS Native
Elements have been added to support mounting
Ceph file systems.

Change-Id: I7516ca10ea9ba2606185395e8f8cedf8304d46fb
2020-05-12 08:12:05 +03:00
Andreas Jaeger c127687d3d Cleanup py27 support
This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from
- Remove obsolete sections from setup.cfg
- Update requirements, no need for python_version anymore
- Cleanup doc/source/ to remove now obsolete content.
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine;
  move contraints into deps
- Move python3 into base tox environment.

Change-Id: Ibd243ce5be8415147c24f596b4059ec3fb68a89c
2020-04-11 15:39:10 +02:00
Andreas Jaeger fd861534ef Update hacking for Python3
The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Change-Id: Ia544cd6c50fa458b14ca02648338aaecb17b0de9
2020-04-01 13:32:53 +02:00
jacky06 67b317ce82 Sync Sphinx requirement
1. Sync sphinx dependency with global requirements. It caps python 2 since
sphinx 2.0 no longer supports Python 2.7.
2. Update the UPPER_CONSTRAINTS_FILE for tox[1]
3. Update some URLs to latest


Change-Id: Ibe8c402c2817c31748e6a4b8344024a276609260
2019-06-25 14:36:09 +08:00
Zuul cbd9e5880b Merge "Replace URLs with URLs" 2019-05-23 20:51:00 +00:00
Andreas Jaeger 6777ba5519 Update docs job
build-openstack-sphinx-docs jobs are obsolete since some time,
use the newer build-openstack-docs-pti jobs instead.

Update tox.ini to use sphinx-build directly as recommended by PTI.

Change-Id: Ib1bb988889db8f6c0a0ee4d4fbf8921725c9790f
2019-05-19 13:36:18 +02:00
caoyuan 782ba82156 Replace URLs with URLs
Change-Id: I38a97dabafd78c48da3668d4b92cb817e1fd3ed9
2019-04-24 00:35:17 +08:00
OpenDev Sysadmins 1643ee1416 OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at with any
questions you may have.
2019-04-19 19:32:17 +00:00
Zuul 0639271d7f Merge "Update service image from Xenial to Bionic" 2019-02-15 08:19:17 +00:00
Tom Barron 8702219bdd Update service image from Xenial to Bionic
Change-Id: Ie809ffe61197a0a33668bd17bcb1a099dbab5bb6
2019-01-25 20:19:23 +00:00
Tom Barron e06b752af8 Ensure artifacts directory exists
When we merged the
new image failed to upload to and the
error message in the post job indicated that the artifacts
directory was missing.

Change-Id: If1068b410e646f780635d733b52172d93da78db5
2019-01-25 12:56:01 +00:00
Tom Barron ee41dc68a8 Add native Zuul v3 manila image elements jobs
Replace the auto-converted legacy jobs with native jobs
and define all the jobs in-tree.  After we merge this we
can remove the legacy-manila-publish-generic job from the
openstack-zuul-jobs repository.

Note that the old job apparently relied on some JJB magic
to construct tagged-image names.  This no longer works so
instead we use 'git describe --tags' to obtain a current
tag, publish the image with its tagged name, and symlink
manila-service-image-master.qcow2 -- which is the expected
image-name for our CI jobs -- to it.

Unfortunately the new publish job can't be tested
beforehand so we may have to follow this with another
patch if there are issues.

Closes-Bug: #1812478
Change-Id: Ie0c367591c0e1ae4fefb62688ecd76aff5b94464
2019-01-22 13:16:39 +00:00
Tom Barron 53b7969bb5 Set .ssh permissions correctly
Owner was being set to manila but group was neglected.

Closes-Bug: #1480870
Closes-Bug: #1646135
Change-Id: I9bc4197221840b33ff5ea56a69d1dd282ee9003b
2018-12-31 02:14:52 +00:00
Tom Barron 3d78b1e2a7 Clean up image build script.
With the dependent changes, we no longer attempt to use a local
webserver to hand off newly created manila service images.

So simplify this script to remove the branch that sets up this
local webserver.

Change-Id: I5795928d6de64ea6602141f494252d7b75fdfbe9
2018-12-18 20:46:26 -05:00
Tom Barron f0fbd9e365 Save service image URL properly
Put the image name in a file for retrieval by jobs that
need it so they don't have to play (buggy) tricks with
git to get it.  Also ensure that debootstrap is installed.

Closes-bug: #1807969
Change-Id: I6dfeb5fb236579aa1755c6806f9ffc397690fba6
2018-12-18 20:44:19 -05:00
Vieri 199f9c9760 Change openstack-dev to openstack-discuss
Mailinglists have been updated. Openstack-discuss replaces openstack-dev.

Change-Id: I5eb53d42c8766361408602fc0f65091e78f15a9e
2018-12-04 19:14:03 +00:00
zhouxinyong d27336ce24 Optimizing the safety of the http link site in HACKING.rst
Change-Id: I5da49b4142eb1bce831938f5b9710877866354d8
2018-11-16 10:38:27 +08:00
Zuul 3836a6f47e Merge "fix tox python3 overrides" 2018-10-17 13:50:40 +00:00
Doug Hellmann 7efceceeb3 fix tox python3 overrides
We want to default to running all tox environments under python 3, so
set the basepython value in each environment.

We do not want to specify a minor version number, because we do not
want to have to update the file every time we upgrade python.

We do not want to set the override once in testenv, because that
breaks the more specific versions used in default environments like
py35 and py36.

Change-Id: I3a20dc68bf1d4051724d148b0fa808ea3d0a1673
Signed-off-by: Doug Hellmann <>
2018-09-26 18:55:49 -04:00