Revert "Workaround for UCA known bug in nova service-list"

python-nova 13.0.0~b3-0ubuntu1~cloud0 no longer reports
incorrect services as being available and down.

This reverts commit 1bccfe65f6.

Change-Id: I51369ee54ae8519c266f577b4abb6767ba7e52d0

fuel_health/config.py

@@ -423,10 +423,7 @@ FuelConf = [
                 default=False,
                 help='ssl usage'),
     cfg.BoolOpt('ssl_data',
-                default=False),
-    cfg.StrOpt('repo_type',
-               default='fuel',
-               help='Repository type')
+                default=False)
 ]
 
 
@@ -624,7 +621,6 @@ class NailgunConfig(object):
         LOG.info('RESPONSE FROM %s - %s' % (api_url, data))
         access_data = data['editable']['access']
         common_data = data['editable']['common']
-        repo_data = data['editable']['repo_setup']
 
         self.identity.admin_tenant_name = \
             (
@@ -662,8 +658,6 @@ class NailgunConfig(object):
         if deployment_os != 'RHEL':
             storage = data['editable']['storage']['volumes_ceph']['value']
             self.volume.ceph_exist = storage
-        if repo_data.get('repo_type', None):
-            self.fuel.repo_type = repo_data['repo_type']['value']
         self.fuel.dns = data['editable']['external_dns'].get('value', None)
         ssl_data = data['editable'].get('public_ssl',
                                         {'horizon': {'value': False}})

fuel_health/tests/sanity/test_sanity_infrastructure.py

@@ -43,7 +43,6 @@ class SanityInfrastructureTest(nmanager.SanityChecksTest):
         cls.key = cls.config.compute.path_to_private_key
         cls.timeout = cls.config.compute.ssh_timeout
         cls.fuel_dns = cls.config.fuel.dns
-        cls.fuel_repo_type = cls.config.fuel.repo_type
 
     @classmethod
     def tearDownClass(cls):
@@ -60,10 +59,6 @@ class SanityInfrastructureTest(nmanager.SanityChecksTest):
         """
         downstate = u'down'
         cmd = 'source /root/openrc; nova service-list'
-        # FIXME(mattymo): Remove this after LP#1543625 is fixed in UCA
-        if self.fuel_repo_type == 'uca':
-            cmd = '{0} | egrep -v "metadata|osapi_compute"'.format(cmd)
-
         if not self.controllers:
             self.skipTest('Step 1 failed: there are no controller nodes.')
         ssh_client = SSHClient(self.controllers[0],