diff --git a/etc/sahara/sahara.conf.sample b/etc/sahara/sahara.conf.sample index d44a775303..442eadc3de 100644 --- a/etc/sahara/sahara.conf.sample +++ b/etc/sahara/sahara.conf.sample @@ -19,7 +19,7 @@ # stored or retrieved in a single operation (integer value) #job_binary_max_KB=5120 -# If set to True, Savanna will use floating IPs to communicate +# If set to True, Sahara will use floating IPs to communicate # with instances. To make sure that all instances have # floating IPs assigned in Nova Network set # "auto_assign_floating_ip=True" in nova.conf. If Neutron is @@ -70,7 +70,7 @@ # Hadoop cluster. (string value) #infrastructure_engine=direct -# A method for Savanna to execute commands on VMs. (string +# A method for Sahara to execute commands on VMs. (string # value) #remote=ssh @@ -225,7 +225,7 @@ # Options defined in sahara.plugins.base # -# List of plugins to be loaded. Savanna preserves the order of +# List of plugins to be loaded. Sahara preserves the order of # the list when returning it. (list value) #plugins=vanilla,hdp,idh @@ -295,7 +295,7 @@ # Options defined in sahara.utils.openstack.keystone # -# Enables Savanna to use Keystone API v3. If that flag is +# Enables Sahara to use Keystone API v3. If that flag is # disabled, per-job clusters will not be terminated # automatically. (boolean value) #use_identity_api_v3=true @@ -326,8 +326,7 @@ # Options defined in sahara.conductor.api # -# Perform savanna-conductor operations locally. (boolean -# value) +# Perform sahara-conductor operations locally. (boolean value) #use_local=true diff --git a/etc/sahara/sahara.conf.sample-basic b/etc/sahara/sahara.conf.sample-basic index b6e520a0af..770f9b55b9 100644 --- a/etc/sahara/sahara.conf.sample-basic +++ b/etc/sahara/sahara.conf.sample-basic @@ -18,7 +18,7 @@ -# If set to True, Savanna will use floating IPs to communicate +# If set to True, Sahara will use floating IPs to communicate # with instances. To make sure that all instances have # floating IPs assigned in Nova Network set # "auto_assign_floating_ip=True" in nova.conf.If Neutron is @@ -42,7 +42,7 @@ # /user/hadoop/ (string value) #job_workflow_postfix= -# Enables Savanna to use Keystone API v3. If that flag is +# Enables Sahara to use Keystone API v3. If that flag is # disabled, per-job clusters will not be terminated # automatically. (boolean value) #use_identity_api_v3=false @@ -107,10 +107,10 @@ # syslog facility to receive log lines (string value) #syslog_log_facility=LOG_USER -# List of plugins to be loaded. Savanna preserves the order of +# List of plugins to be loaded. Sahara preserves the order of # the list when returning it. (list value) #plugins=vanilla,hdp,idh [database] -#connection=sqlite:////savanna/openstack/common/db/$sqlite_db +#connection=sqlite:////sahara/openstack/common/db/$sqlite_db diff --git a/sahara/cli/sahara_api.py b/sahara/cli/sahara_api.py index 865bda4469..2519490144 100644 --- a/sahara/cli/sahara_api.py +++ b/sahara/cli/sahara_api.py @@ -34,7 +34,7 @@ if os.path.exists(os.path.join(possible_topdir, '__init__.py')): sys.path.insert(0, possible_topdir) -gettext.install('savanna', unicode=1) +gettext.install('sahara', unicode=1) from sahara import config @@ -49,14 +49,14 @@ LOG = logging.getLogger(__name__) def main(): dev_conf = os.path.join(possible_topdir, 'etc', - 'savanna', - 'savanna.conf') + 'sahara', + 'sahara.conf') config_files = None if os.path.exists(dev_conf): config_files = [dev_conf] config.parse_configs(sys.argv[1:], config_files) - logging.setup("savanna") + logging.setup("sahara") if not db_api.setup_db(): raise RuntimeError('Failed to create database!') diff --git a/sahara/conductor/api.py b/sahara/conductor/api.py index c242c4085f..f91a28db93 100644 --- a/sahara/conductor/api.py +++ b/sahara/conductor/api.py @@ -25,7 +25,7 @@ from sahara.openstack.common import log as logging conductor_opts = [ cfg.BoolOpt('use_local', default=True, - help='Perform savanna-conductor operations locally.'), + help='Perform sahara-conductor operations locally.'), ] conductor_group = cfg.OptGroup(name='conductor', diff --git a/sahara/config.py b/sahara/config.py index 3504423b78..8ef70ce411 100644 --- a/sahara/config.py +++ b/sahara/config.py @@ -39,7 +39,7 @@ edp_opts = [ networking_opts = [ cfg.BoolOpt('use_floating_ips', default=True, - help='If set to True, Savanna will use floating IPs to ' + help='If set to True, Sahara will use floating IPs to ' 'communicate with instances. To make sure that all ' 'instances have floating IPs assigned in Nova Network ' 'set "auto_assign_floating_ip=True" in nova.conf. ' @@ -96,7 +96,7 @@ def parse_configs(argv=None, conf_files=None): try: version_string = version.version_info.version_string() - CONF(ARGV, project='savanna', version=version_string, + CONF(ARGV, project='sahara', version=version_string, default_config_files=conf_files) except cfg.RequiredOptError as roe: # TODO(slukjanov): replace RuntimeError with concrete exception diff --git a/sahara/main.py b/sahara/main.py index c25b23c70e..62259f35b8 100644 --- a/sahara/main.py +++ b/sahara/main.py @@ -72,7 +72,7 @@ opts = [ 'infrastructure for Hadoop cluster.'), cfg.StrOpt('remote', default='ssh', - help='A method for Savanna to execute commands ' + help='A method for Sahara to execute commands ' 'on VMs.') ] diff --git a/sahara/plugins/base.py b/sahara/plugins/base.py index bcbda170c0..e43f97ba44 100644 --- a/sahara/plugins/base.py +++ b/sahara/plugins/base.py @@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__) opts = [ cfg.ListOpt('plugins', default=['vanilla', 'hdp', 'idh'], - help='List of plugins to be loaded. Savanna preserves the ' + help='List of plugins to be loaded. Sahara preserves the ' 'order of the list when returning it.'), ] diff --git a/sahara/plugins/hdp/ambariplugin.py b/sahara/plugins/hdp/ambariplugin.py index 898cd53e9f..3750ff7530 100644 --- a/sahara/plugins/hdp/ambariplugin.py +++ b/sahara/plugins/hdp/ambariplugin.py @@ -265,7 +265,7 @@ class AmbariPlugin(p.ProvisioningPluginBase): def get_description(self): return ('The Hortonworks OpenStack plugin works with project ' - 'Savanna to automate the deployment of the Hortonworks data' + 'Sahara to automate the deployment of the Hortonworks data' ' platform on OpenStack based public & private clouds') def validate(self, cluster): diff --git a/sahara/plugins/intel/plugin.py b/sahara/plugins/intel/plugin.py index 284f1a40a8..ba325c8f92 100644 --- a/sahara/plugins/intel/plugin.py +++ b/sahara/plugins/intel/plugin.py @@ -25,7 +25,7 @@ class IDHProvider(p.ProvisioningPluginBase): def get_description(self): return \ 'The IDH OpenStack plugin works with project ' \ - 'Savanna to automate the deployment of the Intel Distribution ' \ + 'Sahara to automate the deployment of the Intel Distribution ' \ 'of Apache Hadoop on OpenStack based ' \ 'public & private clouds' diff --git a/sahara/plugins/vanilla/v1_2_1/resources/README.rst b/sahara/plugins/vanilla/v1_2_1/resources/README.rst index 71d35aece2..2c915a45f4 100644 --- a/sahara/plugins/vanilla/v1_2_1/resources/README.rst +++ b/sahara/plugins/vanilla/v1_2_1/resources/README.rst @@ -1,4 +1,4 @@ -Apache Hadoop Configurations for Savanna +Apache Hadoop Configurations for Sahara ======================================== This directory contains default XML configuration files: @@ -9,7 +9,7 @@ This directory contains default XML configuration files: * oozie-default.xml, * hive-default.xml -These files are applied for Savanna's plugin of Apache Hadoop version 1.2.1, +These files are applied for Sahara's plugin of Apache Hadoop version 1.2.1, Oozie 4.0.0, Hive version 0.11.0. @@ -21,6 +21,6 @@ https://github.com/apache/oozie/blob/release-4.0.0/core/src/main/resources/oozie https://github.com/apache/hive/blob/release-0.11.0/conf/hive-default.xml.template XML configs are used to expose default Hadoop configurations to the users through -the Savanna's REST API. It allows users to override some config values which will +the Sahara's REST API. It allows users to override some config values which will be pushed to the provisioned VMs running Hadoop services as part of appropriate xml config. diff --git a/sahara/plugins/vanilla/v2_3_0/resources/README.rst b/sahara/plugins/vanilla/v2_3_0/resources/README.rst index d5790fa4ba..3ed5589cae 100644 --- a/sahara/plugins/vanilla/v2_3_0/resources/README.rst +++ b/sahara/plugins/vanilla/v2_3_0/resources/README.rst @@ -1,4 +1,4 @@ -Apache Hadoop Configurations for Savanna +Apache Hadoop Configurations for Sahara ======================================== This directory contains default XML configuration files: @@ -8,7 +8,7 @@ This directory contains default XML configuration files: * mapred-default.xml, * yarn-default.xml -These files are applied for Savanna's plugin of Apache Hadoop version 2.3.0 +These files are applied for Sahara's plugin of Apache Hadoop version 2.3.0 Files were taken from here: @@ -18,6 +18,6 @@ https://github.com/apache/hadoop-common/blob/release-2.3.0/hadoop-yarn-project/h https://github.com/apache/hadoop-common/blob/release-2.3.0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml XML configs are used to expose default Hadoop configurations to the users through -Savanna's REST API. It allows users to override some config values which will +Sahara's REST API. It allows users to override some config values which will be pushed to the provisioned VMs running Hadoop services as part of appropriate xml config. diff --git a/sahara/resources/userdata.rabbitmq.template b/sahara/resources/userdata.rabbitmq.template index e7cad29b3e..661912ac2b 100644 --- a/sahara/resources/userdata.rabbitmq.template +++ b/sahara/resources/userdata.rabbitmq.template @@ -7,4 +7,4 @@ server_id=${instance_name} debug=true EOF -su -lc "nohup savanna-agent --config-file /etc/guestagent.conf > ~/savanna-agent.log 2>&1 &" ${user_name} +su -lc "nohup sahara-agent --config-file /etc/guestagent.conf > ~/sahara-agent.log 2>&1 &" ${user_name} diff --git a/sahara/utils/agent_remote.py b/sahara/utils/agent_remote.py index 995cf72f73..df02f9e3d5 100644 --- a/sahara/utils/agent_remote.py +++ b/sahara/utils/agent_remote.py @@ -131,7 +131,7 @@ class _InstanceInteropHelper(remote.Remote): def __init__(self, transport, instance): self.instance_name = instance.instance_name - target = messaging.Target(topic='savanna-topic', version='1.0', + target = messaging.Target(topic='sahara-topic', version='1.0', server=instance.instance_name) self._client = messaging.RPCClient(transport, target) diff --git a/sahara/utils/hacking/checks.py b/sahara/utils/hacking/checks.py index e8cdb5401f..890f7a12be 100644 --- a/sahara/utils/hacking/checks.py +++ b/sahara/utils/hacking/checks.py @@ -48,7 +48,7 @@ def import_db_only_in_conductor(logical_line, filename): "from sahara import db", "from sahara.db", "import sahara.db"): - yield (0, "S361: savanna.db import only allowed in " + yield (0, "S361: sahara.db import only allowed in " "sahara/conductor/*") diff --git a/sahara/utils/openstack/keystone.py b/sahara/utils/openstack/keystone.py index fefa914b98..c6b144d7d9 100644 --- a/sahara/utils/openstack/keystone.py +++ b/sahara/utils/openstack/keystone.py @@ -26,7 +26,7 @@ CONF = cfg.CONF opts = [ cfg.BoolOpt('use_identity_api_v3', default=True, - help='Enables Savanna to use Keystone API v3. ' + help='Enables Sahara to use Keystone API v3. ' 'If that flag is disabled, ' 'per-job clusters will not be terminated automatically.') ]