openstack
/
charm-vault
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: Ife3649d0fae29680ec3c355daace23905e1deccf
This commit is contained in:
Alex Kavanagh 2021-05-03 15:33:47 +01:00
parent 28ad14a4d8
commit 1bd5e9c851
4 changed files with 5 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

290
src/build.lock
View File

@ -1,290 +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:snap",
"url": "https://git.launchpad.net/layer-snap",
"vcs": null,
"branch": "refs/heads/master",
"commit": "1873ad4cf7d9928fff249c7f508c0042eb818440"
},
{
"type": "layer",
"item": "layer:leadership",
"url": "https://git.launchpad.net/layer-leadership",
"vcs": null,
"branch": "refs/heads/master",
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
},
{
"type": "layer",
"item": "vault",
"url": null,
"vcs": null,
"branch": "refs/heads/master",
"commit": "0d32b7b32031d694610a3f4becaec234691e6443"
},
{
"type": "layer",
"item": "interface:nrpe-external-master",
"url": "https://github.com/cmars/nrpe-external-master-interface",
"vcs": null,
"branch": "refs/heads/master",
"commit": "2e0e1fdea6d83b55078200aacb537d60013ec5bc"
},
{
"type": "layer",
"item": "interface:pgsql",
"url": "https://git.launchpad.net/interface-pgsql",
"vcs": null,
"branch": "refs/heads/master",
"commit": "c35ef4aa80012d42314db8afa4dde87970204cd9"
},
{
"type": "layer",
"item": "interface:mysql-shared",
"url": "https://github.com/openstack/charm-interface-mysql-shared",
"vcs": null,
"branch": "refs/heads/master",
"commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
},
{
"type": "layer",
"item": "interface:etcd",
"url": "https://github.com/juju-solutions/interface-etcd",
"vcs": null,
"branch": "refs/heads/master",
"commit": "44f244cbd08b86bf2b68bd71c3fb34c7c070c382"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "6c611a3c61909fda411f7a79af53908ec7bef2c8"
},
{
"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:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "python_module",
"package": "ops",
"vcs": null,
"version": "1.1.0"
},
{
"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": "marshmallow-enum",
"vcs": null,
"version": "1.5.1"
},
{
"type": "python_module",
"package": "tenacity",
"vcs": null,
"version": "7.0.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": "loadbalancer_interface",
"vcs": null,
"version": "1.1.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": "cached-property",
"vcs": null,
"version": "1.5.2"
},
{
"type": "python_module",
"package": "marshmallow",
"vcs": null,
"version": "3.11.1"
},
{
"type": "python_module",
"package": "ops_reactive_interface",
"vcs": null,
"version": "1.0.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": "psycopg2",
"vcs": null,
"version": "2.8.6"
},
{
"type": "python_module",
"package": "hvac",
"vcs": null,
"version": "0.6.4"
},
{
"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"
}
]
}

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

4
src/wheelhouse.txt
View File

@ -7,8 +7,8 @@ requests
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://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
loadbalancer-interface

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