Pin stable charm to ``charms.openstack`` stable branch

Fix stable charm location for ``manila``

Change-Id: I1925b18866cdb8554e07d3a5a78b5076c2258cdc
This commit is contained in:
Frode Nordahl 2019-08-14 08:09:47 +02:00
parent 99e4e28333
commit 82bf23e0d1
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
5 changed files with 15 additions and 2 deletions

View File

@ -2,3 +2,7 @@ includes:
- layer:openstack
- interface:manila-plugin
repo: https://github.com/openstack/charm-manila-generic
options:
basic:
include_system_packages: True
packages: ['python3-apt']

View File

@ -58,7 +58,7 @@ class ManilaGenericBasicDeployment(OpenStackAmuletDeployment):
'constraints': {'mem': '3072M'}},
{'name': 'rabbitmq-server'},
{'name': 'keystone'},
{'name': 'manila'}
{'name': 'manila', 'location': 'cs:~openstack-charmers/manila'},
]
super(ManilaGenericBasicDeployment, self)._add_services(
this_service, other_services)

2
src/wheelhouse.txt Normal file
View File

@ -0,0 +1,2 @@
git+https://opendev.org/openstack/charms.openstack.git@stable/19.07#egg=charms.openstack

View File

@ -22,7 +22,8 @@ deps =
[testenv:build]
basepython = python2.7
commands =
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
charm-build --log-level DEBUG -o {toxinidir}/build \
-w transitional-wheelhouse-override.txt src {posargs}
[testenv:py27]
basepython = python2.7

View File

@ -0,0 +1,6 @@
# NOTE(fnordahl): the stable branch needs to have this wheelhouse override
# in place until transition to ``include_system_packages=false`` is complete
pip>=7.0.0,<8.2.0
setuptools>24.3,<=39.0.1
setuptools-scm<=1.17.0
git+https://github.com/juju/charm-helpers.git@stable/19.07#egg=charmhelpers