From c47975a56e975a76579c538ad7b8da1ce6b59cf0 Mon Sep 17 00:00:00 2001 From: Vitaly Kramskikh Date: Wed, 15 Jul 2015 18:15:21 +0300 Subject: [PATCH] Rename role 'kvm-virt' to 'virt' in UI Related to blueprint reduced-footprint Change-Id: I1f665ff3aa5ccbe712ac2646b3af32cf1c4cc365 --- nailgun/static/views/cluster_page.jsx | 2 +- nailgun/static/views/dialogs.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nailgun/static/views/cluster_page.jsx b/nailgun/static/views/cluster_page.jsx index de40dd3408..169fcda8e8 100644 --- a/nailgun/static/views/cluster_page.jsx +++ b/nailgun/static/views/cluster_page.jsx @@ -398,7 +398,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins stoppableTask = !_.contains(['stop_deployment', 'reset_environment', 'update', 'spawn_vms'], taskName), isDeploymentImpossible = cluster.get('release').get('state') == 'unavailable' || (!cluster.get('nodes').hasChanges() && !cluster.needsRedeployment()), isVMsProvisioningAvailable = cluster.get('nodes').any(function(node) { - return node.get('pending_addition') && node.hasRole('kvm-virt'); + return node.get('pending_addition') && node.hasRole('virt'); }); return (
diff --git a/nailgun/static/views/dialogs.jsx b/nailgun/static/views/dialogs.jsx index de54050ea8..cc0b5d8a5c 100644 --- a/nailgun/static/views/dialogs.jsx +++ b/nailgun/static/views/dialogs.jsx @@ -437,7 +437,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo }, renderBody: function() { var vmsCount = this.props.cluster.get('nodes').where(function(node) { - return node.get('pending_addition') && node.hasRole('kvm-virt'); + return node.get('pending_addition') && node.hasRole('virt'); }).length; return i18n('dialog.provision_vms.text', {count: vmsCount}); }, @@ -733,7 +733,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo componentDidMount: function() { this.assignAccordionEvents(); this.setDialogTitle(); - if (this.props.node.get('pending_addition') && this.props.node.hasRole('kvm-virt')) { + if (this.props.node.get('pending_addition') && this.props.node.hasRole('virt')) { var VMsConfModel = new models.BaseModel(); VMsConfModel.url = _.result(this.props.node, 'url') + '/vms_conf'; this.setProps({VMsConfModel: VMsConfModel});