openstack
/
fuel-ostf
Code Issues Proposed changes

Change savanna requirements 

Change savanna requirements to sahara requirements
because renamed savanna project to sahara project

Change-Id: I9917184504870e978ba0637a12a8911e2469a5d0
This commit is contained in:
Vadim Rovachev 2014-04-01 14:40:39 +04:00
parent 85b48d16c2
commit b738b5a6fe
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuel_health/nmanager.py
View File

@ -33,10 +33,10 @@ except:
LOG.debug(traceback.format_exc())
LOG.warning('Muranoclient could not be imported.')
try:
import savannaclient.api.client
import saharaclient.api.client
except:
LOG.debug(traceback.format_exc())
LOG.warning('Savanna client could not be imported.')
LOG.warning('Sahara client could not be imported.')
try:
import ceilometerclient.v2.client
except:
@ -222,11 +222,11 @@ class OfficialClientManager(fuel_health.manager.Manager):
username = self.config.identity.admin_username
if not password:
password = self.config.identity.admin_password
return savannaclient.api.client.Client(username=username,
api_key=password,
project_name=tenant_name,
auth_url=auth_url,
savanna_url=savanna_url)
return saharaclient.api.client.Client(username=username,
api_key=password,
project_name=tenant_name,
auth_url=auth_url,
savanna_url=savanna_url)
def _get_ceilometer_client(self):
keystone = self._get_identity_client()

3
setup.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import multiprocessing
import setuptools
@ -23,7 +22,7 @@ fuel_health_reqs = [
'python-novaclient>=2.15.0',
'python-heatclient>=0.2.5',
'python-muranoclient>=0.2.11',
'python-savannaclient>=0.3',
'python-saharaclient>=0.6.0',
'paramiko>=1.10.1',
'requests>=1.1,<1.2.3',
'unittest2>=0.5.1',