Release sync for 20.08

- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Co-Authored-By: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>

Change-Id: I750ff976bedeaaf9806552b5ba11c452bbd14ea6

rebuild

@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-91c6146e-a4d0-11ea-809d-83592a68a4cf
+d9d6c19a-d02c-11ea-8983-eb9bda9bf3b3

src/test-requirements.txt

@@ -5,4 +5,4 @@
 #
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

src/tests/bundles/bionic-rocky.yaml

@@ -3,7 +3,7 @@ options:
   source: &source cloud:bionic-rocky
 services:
   manila-ganesha:
-    num_units: 3
+    num_units: 1
     series: bionic
     charm: ../../../manila-ganesha
     options:

src/tests/bundles/bionic-stein.yaml

@@ -3,7 +3,7 @@ options:
   source: &source cloud:bionic-stein
 services:
   manila-ganesha:
-    num_units: 3
+    num_units: 1
     series: bionic
     charm: ../../../manila-ganesha
     options:

src/tests/bundles/bionic-train.yaml

@@ -3,7 +3,7 @@ options:
   source: &source cloud:bionic-train
 services:
   manila-ganesha:
-    num_units: 3
+    num_units: 1
     series: bionic
     charm: ../../../manila-ganesha
     options:

src/tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -1,11 +0,0 @@
-# Add True HA
-applications:
-  manila-ganesha:
-    options:
-      vip: '{{ OS_VIP00 }}'
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-relations:
-- - manila-ganesha
-  - hacluster

src/tox.ini

@@ -47,4 +47,4 @@ commands =
     functest-run-suite --keep-model --bundle {posargs}
 
 [testenv:venv]
-commands = {posargs}
+commands = {posargs}

test-requirements.txt

@@ -11,4 +11,13 @@ charms.reactive
 mock>=1.2
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+#
+# Revisit for removal / mock improvement:
+netifaces        # vault
+psycopg2-binary  # vault
+tenacity         # vault
+pbr              # vault
+cryptography     # vault, keystone-saml-mellon
+lxml             # keystone-saml-mellon
+hvac             # vault, barbican-vault

tox.ini

@@ -50,6 +50,11 @@ basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
@@ -89,4 +94,4 @@ commands = {posargs}
 
 [flake8]
 # E402 ignore necessary for path append before sys module import in actions
-ignore = E402,W504
+ignore = E402,W504