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: Ib7a6e24d74a8bb76eb20d101c5b621e05d0cc153
This commit is contained in:
Alex Kavanagh 2021-05-03 15:33:46 +01:00
parent 841fbcdebc
commit e467a174da
4 changed files with 5 additions and 221 deletions

View File

@ -1,216 +0,0 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
},
{
"type": "layer",
"item": "barbican-vault",
"url": null,
"vcs": null,
"branch": "refs/heads/master",
"commit": "e0e4ab4c052a39943c6310b5797bc329e0351c5f"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:juju-info",
"url": "https://github.com/juju-solutions/interface-juju-info.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "4e2f90052b3c02031d09f10900c9e9cb22565dee"
},
{
"type": "layer",
"item": "interface:vault-kv",
"url": "https://github.com/openstack-charmers/charm-interface-vault-kv.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "dceab99ac3739cc7265e386287f100f1bfebc47f"
},
{
"type": "layer",
"item": "interface:barbican-secrets",
"url": "https://github.com/openstack/charm-interface-barbican-secrets.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "1be4ff07766e51523be56115bb7df5e0cd82055f"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://opendev.org/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.04",
"version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "requests",
"vcs": null,
"version": "2.25.1"
},
{
"type": "python_module",
"package": "idna",
"vcs": null,
"version": "2.10"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.5.1"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "chardet",
"vcs": null,
"version": "4.0.0"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "20.4.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "certifi",
"vcs": null,
"version": "2020.12.5"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.04",
"version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
"vcs": "git"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "hvac",
"vcs": null,
"version": "0.10.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.5.2"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "urllib3",
"vcs": null,
"version": "1.26.4"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.10.9"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.15.0"
}
]
}

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

View File

@ -1,6 +1,6 @@
# Pin hvac for a consistent response type
hvac==0.10.1
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://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers

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