openstack
/
charm-ceph-fs
Code Issues Proposed changes

Updates to flip all libraries back to master 

This patchset updates all the requirements for charms.openstack,
charm-helpers, charms.ceph, zaza and zaza-openstack-tests back
to master branch.

Change-Id: I89267c171f245fbc92ad67545e97d99f48f798e2
This commit is contained in:
Alex Kavanagh 2021-05-03 15:33:46 +01:00
parent 36869e1e1f
commit 581e730614
4 changed files with 6 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
src/build.lock
View File

@ -1,198 +0,0 @@
{
"locks": [
{
"item": "layer:options",
"vcs": null,
"url": "https://github.com/juju-solutions/layer-options.git",
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
"type": "layer",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"item": "layer:basic",
"vcs": null,
"url": "https://github.com/juju-solutions/layer-basic.git",
"branch": "623e69c7b432456fd4364f6e1835424fd6b5425e",
"type": "layer",
"commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
},
{
"item": "layer:openstack",
"vcs": null,
"url": "https://github.com/openstack/charm-layer-openstack",
"branch": "ba152d41b4a1109073d335415f43c4248109e7c7",
"type": "layer",
"commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
},
{
"item": "layer:ceph",
"vcs": null,
"url": "https://github.com/openstack/charm-layer-ceph.git",
"branch": "17d40abd8d9ec3b8c32756ca981c80c4733c016f",
"type": "layer",
"commit": "17d40abd8d9ec3b8c32756ca981c80c4733c016f"
},
{
"item": "ceph-fs",
"vcs": null,
"url": null,
"branch": "46797fc9869d86352e513aa4f7a26c0d9ab3c6ec",
"type": "layer",
"commit": "46797fc9869d86352e513aa4f7a26c0d9ab3c6ec"
},
{
"item": "interface:tls-certificates",
"vcs": null,
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"branch": "d9850016d930a6d507b9fd45e2598d327922b140",
"type": "layer",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"item": "interface:ceph-mds",
"vcs": null,
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
"branch": "72245e1d002fb9c65c9574d65b5952275b3411fb",
"type": "layer",
"commit": "72245e1d002fb9c65c9574d65b5952275b3411fb"
},
{
"vcs": null,
"type": "python_module",
"package": "charms.reactive",
"version": "1.4.1"
},
{
"vcs": null,
"type": "python_module",
"package": "netifaces",
"version": "0.10.9"
},
{
"vcs": null,
"type": "python_module",
"package": "PyYAML",
"version": "5.2"
},
{
"vcs": null,
"type": "python_module",
"package": "psutil",
"version": "5.8.0"
},
{
"vcs": null,
"type": "python_module",
"package": "pyaml",
"version": "20.4.0"
},
{
"vcs": null,
"type": "python_module",
"package": "netaddr",
"version": "0.7.19"
},
{
"vcs": null,
"type": "python_module",
"package": "pyxattr",
"version": "0.7.2"
},
{
"vcs": null,
"type": "python_module",
"package": "dnspython3",
"version": "1.15.0"
},
{
"vcs": null,
"type": "python_module",
"package": "setuptools",
"version": "41.6.0"
},
{
"vcs": null,
"type": "python_module",
"package": "wheel",
"version": "0.33.6"
},
{
"vcs": "git",
"url": "git+https://opendev.org/openstack/charms.openstack.git",
"package": "charms.openstack",
"branch": "stable/21.04",
"version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
"type": "python_module"
},
{
"vcs": null,
"type": "python_module",
"package": "six",
"version": "1.15.0"
},
{
"vcs": null,
"type": "python_module",
"package": "MarkupSafe",
"version": "1.1.1"
},
{
"vcs": null,
"type": "python_module",
"package": "Tempita",
"version": "0.5.2"
},
{
"vcs": null,
"type": "python_module",
"package": "pbr",
"version": "5.5.1"
},
{
"vcs": null,
"type": "python_module",
"package": "setuptools_scm",
"version": "1.17.0"
},
{
"vcs": null,
"type": "python_module",
"package": "dnspython",
"version": "1.15.0"
},
{
"vcs": null,
"type": "python_module",
"package": "pip",
"version": "18.1"
},
{
"vcs": null,
"type": "python_module",
"package": "Jinja2",
"version": "2.10.1"
},
{
"vcs": "git",
"url": "git+https://github.com/juju/charm-helpers.git",
"package": "charmhelpers",
"branch": "stable/21.04",
"version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
"type": "python_module"
},
{
"vcs": "git",
"url": "git+https://opendev.org/openstack/charms.ceph.git",
"package": "charms.ceph",
"branch": "stable/21.04",
"version": "9bfe43ee654d016d7f09ede406c45674821f2866",
"type": "python_module"
},
{
"vcs": null,
"type": "python_module",
"package": "ceph_api",
"version": "0.4.0"
}
]
}

4
src/test-requirements.txt
View File

@ -11,5 +11,5 @@ charm-tools>=2.4.4
keyring<21
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git@stable/21.04#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

6
src/wheelhouse.txt
View File

@ -4,8 +4,8 @@ ceph_api
pyxattr
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://opendev.org/openstack/charms.ceph.git@stable/21.04#egg=charms.ceph
git+https://github.com/openstack/charms.ceph.git#egg=charms.ceph
git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers

2
test-requirements.txt
View File

@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault