openstack/deb-sahara
Code Issues Proposed changes

Merge "Revert "Fix gate pep8""

Browse Source
This commit is contained in:
Jenkins 2016-02-21 13:03:22 +00:00 committed by Gerrit Code Review
commit 84f727e084
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/plugins/mapr/services/impala/impala.py
View File

@ -57,7 +57,7 @@ class Impala(s.Service):
return {} return {}
def get_config_files(self, cluster_context, configs, instance=None): def get_config_files(self, cluster_context, configs, instance=None):
defaults = 'plugins/mapr/services/impala/resources/impala-env.sh' defaults = 'plugins/mapr/services/impala/resources/impala-env.sh.j2'
impala_env = bcf.TemplateFile("env.sh") impala_env = bcf.TemplateFile("env.sh")
impala_env.remote_path = self.conf_dir(cluster_context) impala_env.remote_path = self.conf_dir(cluster_context)

7
sahara/plugins/mapr/services/impala/resources/impala-env.sh → sahara/plugins/mapr/services/impala/resources/impala-env.sh.j2
View File

@ -1,4 +1,3 @@
#!/bin/bash
# these are configured automatically when impala is installed # these are configured automatically when impala is installed
export IMPALA_HOME=/opt/mapr/impala/impala-{{ impala_version }} export IMPALA_HOME=/opt/mapr/impala/impala-{{ impala_version }}
export MAPR_HOME=/opt/mapr export MAPR_HOME=/opt/mapr
@ -8,9 +7,9 @@ export IMPALA_VERSION={{ impala_version }}
[ -f ${MAPR_HOME}/conf/env.sh ] && . ${MAPR_HOME}/conf/env.sh [ -f ${MAPR_HOME}/conf/env.sh ] && . ${MAPR_HOME}/conf/env.sh
# This MUST point to the node running statestore # This MUST point to the node running statestore
IMPALA_STATE_STORE_HOST=$(statestore_host | default("localhost", True)) IMPALA_STATE_STORE_HOST={{ statestore_host | default("localhost", True) }}
IMPALA_STATE_STORE_PORT=$(statestore_port | default("24000", True)) IMPALA_STATE_STORE_PORT={{ statestore_port | default("24000", True) }}
CATALOG_SERVICE_HOST=$(catalog_host | default("localhost", True)) CATALOG_SERVICE_HOST={{ catalog_host | default("localhost", True) }}
# By default, we use the Hive configuration. # By default, we use the Hive configuration.
# Uncomment this If hive is not configured, or we wish to override it. # Uncomment this If hive is not configured, or we wish to override it.