commit: 82b3c793d7680c91fd6dec2d5a701ef58cbec684 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Tue Apr 19 00:30:36 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Tue Apr 19 18:31:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82b3c793
app-admin/glance: more systemd units, removed optional deps Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> .../glance/files/openstack-glance-registry.service | 15 +++++++++++++++ .../glance/files/openstack-glance-scrubber.service | 15 +++++++++++++++ ...lance-24.0.0.ebuild => glance-24.0.0-r1.ebuild} | 22 +++++----------------- app-admin/glance/metadata.xml | 3 --- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/app-admin/glance/files/openstack-glance-registry.service b/app-admin/glance/files/openstack-glance-registry.service new file mode 100644 index 000000000..f361bf391 --- /dev/null +++ b/app-admin/glance/files/openstack-glance-registry.service @@ -0,0 +1,15 @@ +[Unit] +Description=OpenStack Image Service (code-named Glance) Registry server +After=syslog.target network.target + +[Service] +Type=notify +NotifyAccess=all +Restart=always +User=glance +ExecStart=/usr/bin/glance-registry +PrivateTmp=true + +[Install] +WantedBy=multi-user.target + diff --git a/app-admin/glance/files/openstack-glance-scrubber.service b/app-admin/glance/files/openstack-glance-scrubber.service new file mode 100644 index 000000000..bedc22536 --- /dev/null +++ b/app-admin/glance/files/openstack-glance-scrubber.service @@ -0,0 +1,15 @@ +[Unit] +Description=OpenStack Image Service deferred image deletion service +After=syslog.target network.target + +[Service] +Type=notify +NotifyAccess=all +Restart=always +User=glance +ExecStart=/usr/bin/glance-scrubber +PrivateTmp=true + +[Install] +WantedBy=multi-user.target + diff --git a/app-admin/glance/glance-24.0.0.ebuild b/app-admin/glance/glance-24.0.0-r1.ebuild similarity index 93% rename from app-admin/glance/glance-24.0.0.ebuild rename to app-admin/glance/glance-24.0.0-r1.ebuild index 8d8fd1533..3d51af337 100644 --- a/app-admin/glance/glance-24.0.0.ebuild +++ b/app-admin/glance/glance-24.0.0-r1.ebuild @@ -18,7 +18,6 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; KEYWORDS="~amd64" LICENSE="Apache-2.0" SLOT="0" -IUSE="mysql postgres +sqlite +swift" RDEPEND=" >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}] @@ -64,17 +63,7 @@ RDEPEND=" >=dev-python/os-win-4.0.1[${PYTHON_USEDEP}] >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - ) + >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] acct-user/glance acct-group/glance @@ -100,12 +89,9 @@ BDEPEND=" >=dev-python/python-cinderclient-4.1.0[${PYTHON_USEDEP}] >=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}] >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] - ) -" -REQUIRED_USE=" - || ( mysql postgres sqlite ) - test? ( mysql ) + >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] + ) " distutils_enable_tests pytest @@ -139,6 +125,8 @@ python_install_all() { keepdir /var/lib/glance/scrubber systemd_dounit "${FILESDIR}/openstack-glance-api.service" + systemd_dounit "${FILESDIR}/openstack-glance-registry.service" + systemd_dounit "${FILESDIR}/openstack-glance-scrubber.service" newtmpfiles "${FILESDIR}/glance.tmpfiles" glance.conf insinto /etc/logrotate.d diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml index 4979a3dcc..dc29bdd6d 100644 --- a/app-admin/glance/metadata.xml +++ b/app-admin/glance/metadata.xml @@ -11,9 +11,6 @@ machine images. Glance has a RESTful API that allows querying of VM image metadata as well as retrieval of the actual image. </longdescription> - <use> - <flag name="swift">Adds swift storage support</flag> - </use> <upstream> <remote-id type="launchpad">glance</remote-id> </upstream>
