summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Gridnev <vgridnev@mirantis.com>2017-02-01 13:39:52 +0400
committerVitaly Gridnev <vgridnev@mirantis.com>2017-02-01 13:47:58 +0400
commitf60d2c645cfcb209041234fe33a40ccc59eb4196 (patch)
treea39ef79f9ea49a15ebef20cbd5a80af8dd0a5d8f
parente71059ac4d6546c153b7229d4d7763564c6cdf1f (diff)
[sahara] provide default version of hadoop version
this version is the only currently available version in vanilla plugin. Change-Id: I58cd0aa6165e58b694a43d7f3314030433f160e5 Closes-bug: 1634523
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Timur Nurlygayanov <tnurlygayanov@mirantis.com> Code-Review+1: Kyrylo Romanenko <kromanenko@mirantis.com> Code-Review+1: Evgeny Sikachev <esikachev@mirantis.com> Code-Review+2: Andrey Sledzinskiy <asledzinskiy@mirantis.com> Workflow+1: Andrey Sledzinskiy <asledzinskiy@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 08 Feb 2017 12:46:57 +0000 Reviewed-on: https://review.openstack.org/427610 Project: openstack/fuel-ostf Branch: refs/heads/master
-rw-r--r--fuel_health/tests/sanity/test_sanity_sahara.py2
-rw-r--r--fuel_health/tests/tests_platform/test_ceilometer.py2
-rw-r--r--fuel_health/tests/tests_platform/test_sahara.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/fuel_health/tests/sanity/test_sanity_sahara.py b/fuel_health/tests/sanity/test_sanity_sahara.py
index 4e3f003..97441c1 100644
--- a/fuel_health/tests/sanity/test_sanity_sahara.py
+++ b/fuel_health/tests/sanity/test_sanity_sahara.py
@@ -61,7 +61,7 @@ class VanillaTwoTemplatesTest(SaharaTemplatesTest):
61 } 61 }
62 self._plugin_name = 'vanilla' 62 self._plugin_name = 'vanilla'
63 self._hadoop_version = mapping_versions_of_plugin.get( 63 self._hadoop_version = mapping_versions_of_plugin.get(
64 self.config.fuel.fuel_version) 64 self.config.fuel.fuel_version, "2.7.1")
65 self._node_processes = ['resourcemanager', 'namenode', 65 self._node_processes = ['resourcemanager', 'namenode',
66 'secondarynamenode', 'oozie', 'historyserver', 66 'secondarynamenode', 'oozie', 'historyserver',
67 'nodemanager', 'datanode'] 67 'nodemanager', 'datanode']
diff --git a/fuel_health/tests/tests_platform/test_ceilometer.py b/fuel_health/tests/tests_platform/test_ceilometer.py
index 3459cd6..6535800 100644
--- a/fuel_health/tests/tests_platform/test_ceilometer.py
+++ b/fuel_health/tests/tests_platform/test_ceilometer.py
@@ -529,7 +529,7 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
529 "10.0": "2.7.1" 529 "10.0": "2.7.1"
530 } 530 }
531 hadoop_version = mapping_versions_of_plugin.get( 531 hadoop_version = mapping_versions_of_plugin.get(
532 self.config.fuel.fuel_version) 532 self.config.fuel.fuel_version, "2.7.1")
533 533
534 fail_msg = 'Failed to find correctly registered Sahara image.' 534 fail_msg = 'Failed to find correctly registered Sahara image.'
535 msg = 'finding correctly registered Sahara image' 535 msg = 'finding correctly registered Sahara image'
diff --git a/fuel_health/tests/tests_platform/test_sahara.py b/fuel_health/tests/tests_platform/test_sahara.py
index 9f8f54e..9ae5fa1 100644
--- a/fuel_health/tests/tests_platform/test_sahara.py
+++ b/fuel_health/tests/tests_platform/test_sahara.py
@@ -101,7 +101,7 @@ class VanillaTwoClusterTest(SaharaClusterTest):
101 } 101 }
102 self._plugin_name = 'vanilla' 102 self._plugin_name = 'vanilla'
103 self._hadoop_version = mapping_versions_of_plugin.get( 103 self._hadoop_version = mapping_versions_of_plugin.get(
104 self.config.fuel.fuel_version) 104 self.config.fuel.fuel_version, "2.7.1")
105 self._worker_processes = ['nodemanager', 'datanode'] 105 self._worker_processes = ['nodemanager', 'datanode']
106 self._master_processes = ['resourcemanager', 'namenode', 'oozie', 106 self._master_processes = ['resourcemanager', 'namenode', 'oozie',
107 'historyserver', 'secondarynamenode'] 107 'historyserver', 'secondarynamenode']