Add disco-stein bundle to gate tests.

The bundle disco-stein was in the dev_bundles because
a bug with the Python 3.7 syntax prevented the success of
the deployment of HA clusters. This bug is fixed, we can
reintegrate disco-stein in the gate_bundles.

Other minor adds:
- Changing naming convention for vip: 'Amulet' is deprecated.
- Passing OS env vars

LP Related-Bug: #1823719
Change-Id: I787248ad2983858c6db2e5a838270a128dae717a

.gitignore

@@ -13,3 +13,4 @@ func-results.json
 .local
 __pycache__
 .stestr
+.idea

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

@@ -2,7 +2,7 @@
 applications:
   keystone:
     options:
-      vip: {{ AMULET_OS_VIP00 }}
+      vip: '{{ OS_VIP00 }}'
   hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0

tests/tests.yaml

@@ -2,6 +2,7 @@ charm_name: keystone
 smoke_bundles:
 - bionic-stein
 gate_bundles:
+- disco-stein
 - bionic-stein
 - bionic-rocky
 - bionic-queens
@@ -10,10 +11,7 @@ gate_bundles:
 - xenial-ocata
 - xenial-mitaka
 - trusty-mitaka
-dev_bundles:
+comment:
-- disco-stein
-comment: |
-  disable ``disco-stein`` test pending LP: #1823718
   the glance configure job validates operation of identity-service relation
 configure:
 - zaza.openstack.charm_tests.glance.setup.add_lts_image

tox.ini

@@ -9,12 +9,11 @@ skipsdist = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          CHARM_DIR={envdir}
-         AMULET_SETUP_TIMEOUT=5400
 install_command =
   pip install {opts} {packages}
 commands = stestr run {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_*
+passenv = HOME TERM CS_API_* OS_*
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:py35]