openstack/sahara
Code Issues Proposed changes

Merge "Fix configs for repos and swift urls in CDH 5.7"

Browse Source
This commit is contained in:
Jenkins 2016-08-11 16:21:00 +00:00 committed by Gerrit Code Review
commit d4330cd38d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sahara/plugins/cdh/v5_7_0/config_helper.py
View File

@ -23,9 +23,9 @@ class ConfigHelperV570(c_h.ConfigHelper):
CDH5_UBUNTU_REPO = (
'deb [arch=amd64] http://archive.cloudera.com/cdh5'
'/ubuntu/trusty/amd64/cdh trusty-cdh5.5.0 contrib'
'/ubuntu/trusty/amd64/cdh trusty-cdh5.7.0 contrib'
'\ndeb-src http://archive.cloudera.com/cdh5/ubuntu'
'/trusty/amd64/cdh trusty-cdh5.5.0 contrib')
'/trusty/amd64/cdh trusty-cdh5.7.0 contrib')
DEFAULT_CDH5_UBUNTU_REPO_KEY_URL = (
'http://archive.cloudera.com/cdh5/ubuntu'
@ -33,9 +33,9 @@ class ConfigHelperV570(c_h.ConfigHelper):
CM5_UBUNTU_REPO = (
'deb [arch=amd64] http://archive.cloudera.com/cm5'
'/ubuntu/trusty/amd64/cm trusty-cm5.5.0 contrib'
'/ubuntu/trusty/amd64/cm trusty-cm5.7.0 contrib'
'\ndeb-src http://archive.cloudera.com/cm5/ubuntu'
'/trusty/amd64/cm trusty-cm5.5.0 contrib')
'/trusty/amd64/cm trusty-cm5.7.0 contrib')
DEFAULT_CM5_UBUNTU_REPO_KEY_URL = (
'http://archive.cloudera.com/cm5/ubuntu'
@ -45,7 +45,7 @@ class ConfigHelperV570(c_h.ConfigHelper):
'[cloudera-cdh5]'
'\nname=Cloudera\'s Distribution for Hadoop, Version 5'
'\nbaseurl=http://archive.cloudera.com/cdh5/redhat/6'
'/x86_64/cdh/5.5.0/'
'/x86_64/cdh/5.7.0/'
'\ngpgkey = http://archive.cloudera.com/cdh5/redhat/6'
'/x86_64/cdh/RPM-GPG-KEY-cloudera'
'\ngpgcheck = 1')
@ -54,7 +54,7 @@ class ConfigHelperV570(c_h.ConfigHelper):
'[cloudera-manager]'
'\nname=Cloudera Manager'
'\nbaseurl=http://archive.cloudera.com/cm5/redhat/6'
'/x86_64/cm/5.5.0/'
'/x86_64/cm/5.7.0/'
'\ngpgkey = http://archive.cloudera.com/cm5/redhat/6'
'/x86_64/cm/RPM-GPG-KEY-cloudera'
'\ngpgcheck = 1')
@ -77,8 +77,8 @@ class ConfigHelperV570(c_h.ConfigHelper):
DEFAULT_SWIFT_LIB_URL = (
'https://repository.cloudera.com/artifactory/repo/org'
'/apache/hadoop/hadoop-openstack/2.6.0-cdh5.5.0'
'/hadoop-openstack-2.6.0-cdh5.5.0.jar')
'/apache/hadoop/hadoop-openstack/2.6.0-cdh5.7.0'
'/hadoop-openstack-2.6.0-cdh5.7.0.jar')
HIVE_SERVER2_SENTRY_SAFETY_VALVE = f.get_file_text(
path_to_config + 'hive-server2-sentry-safety.xml')

4
sahara/plugins/cdh/v5_7_0/db_helper.py
View File

@ -28,7 +28,7 @@ def get_sentry_db_password(cluster):
def create_hive_database(cluster, remote):
db_password = get_hive_db_password(cluster)
create_db_script = files.get_file_text(
'plugins/cdh/v5_5_0/resources/create_hive_db.sql')
'plugins/cdh/v5_7_0/resources/create_hive_db.sql')
create_db_script = create_db_script % db_password
dh.remote_execute_db_script(remote, create_db_script)
@ -36,6 +36,6 @@ def create_hive_database(cluster, remote):
def create_sentry_database(cluster, remote):
db_password = get_sentry_db_password(cluster)
create_db_script = files.get_file_text(
'plugins/cdh/v5_5_0/resources/create_sentry_db.sql')
'plugins/cdh/v5_7_0/resources/create_sentry_db.sql')
create_db_script = create_db_script % db_password
dh.remote_execute_db_script(remote, create_db_script)