Re-enable HA VIP and remove deprecated tests

The underlying test infrastructure and tooling previously had
an issue which prevented HA VIP tests from functioning.  That
issue is now resolved, and the VIP tests can be re-enabled.

Change-Id: I3f0bdace1baf62a646a487766744fdc212311640
This commit is contained in:
Ryan Beisner 2017-08-01 13:59:34 -05:00
parent 1e4cc0bc8f
commit feaad01996
1 changed files with 2 additions and 6 deletions

View File

@ -27,7 +27,9 @@ class BasicDeployment(OpenStackAmuletDeployment):
self.units = units
self.master_unit = None
self.vip = None
self.ha = False
if units > 1:
self.ha = True
if vip:
self.vip = vip
elif 'AMULET_OS_VIP' in os.environ:
@ -42,12 +44,6 @@ class BasicDeployment(OpenStackAmuletDeployment):
("Please set the vip in local.yaml or "
"env var AMULET_OS_VIP to run this test "
"suite"))
# Currenlty serverstack is unable to validate HA
# temporarily turn off HA
self.vip = None
self.ha = False
self.log = self.utils.get_logger()
def _add_services(self):