openstack
/
sahara
Code Issues Proposed changes

Merge "Fixed vanilla1/2 cluster not launched problem"

This commit is contained in:
Jenkins 2015-01-05 20:24:57 +00:00 committed by Gerrit Code Review
parent 3e31824e4b d4c999a775
commit fde4e0f9b3
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sahara/plugins/vanilla/hadoop2/config.py
View File

@ -39,7 +39,8 @@ HADOOP_GROUP = 'hadoop'
def configure_cluster(pctx, cluster):
LOG.debug("Configuring cluster \"%s\"", cluster.name)
if (CONF.use_identity_api_v3 and vu.get_hiveserver(cluster) and
if (CONF.use_identity_api_v3 and CONF.use_domain_for_proxy_users and
vu.get_hiveserver(cluster) and
c_helper.is_swift_enabled(pctx, cluster)):
cluster = proxy.create_proxy_user_for_cluster(cluster)

10
sahara/plugins/vanilla/hadoop2/validation.py
View File

@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
from sahara import exceptions as e
from sahara.i18n import _
from sahara.plugins import exceptions as ex
from sahara.plugins import utils as u
@ -24,9 +21,6 @@ from sahara.plugins.vanilla import utils as vu
from sahara.utils import general as gu
CONF = cfg.CONF
def validate_cluster_creating(pctx, cluster):
nn_count = _get_inst_count(cluster, 'namenode')
if nn_count != 1:
@ -83,10 +77,6 @@ def validate_cluster_creating(pctx, cluster):
raise ex.InvalidComponentCountException('hive', _('0 or 1'),
hive_count)
if hive_count and not CONF.use_domain_for_proxy_users:
raise e.ConfigurationError(
_("Service 'hiveserver' requires configured proxy domain."))
def validate_additional_ng_scaling(cluster, additional):
rm = vu.get_resourcemanager(cluster)

3
sahara/plugins/vanilla/v1_2_1/versionhandler.py
View File

@ -268,7 +268,8 @@ class VersionHandler(avm.AbstractVersionHandler):
run.start_processes(r, *tt_dn_procs)
def _setup_instances(self, cluster, instances):
if (CONF.use_identity_api_v3 and vu.get_hiveserver(cluster) and
if (CONF.use_identity_api_v3 and CONF.use_domain_for_proxy_users and
vu.get_hiveserver(cluster) and
c_helper.is_swift_enable(cluster)):
cluster = proxy.create_proxy_user_for_cluster(cluster)
instances = utils.get_instances(cluster)