Merge "Update roles"

4 files changed, 11 insertions, 11 deletions

diff --git a/tuskar_ui/api/heat.py b/tuskar_ui/api/heat.py
index e9fd1827..c041ee7b 100644
--- a/tuskar_ui/api/heat.py
+++ b/tuskar_ui/api/heat.py
@@ -361,7 +361,7 @@ class Stack(base.APIResourceWrapper):
             return overcloud_keystoneclient(
                 self._request,
                 self.keystone_auth_url,
-                self.plan.parameter_value('controller-1::AdminPassword'))
+                self.plan.parameter_value('Controller-1::AdminPassword'))
         except Exception:
             LOG.debug('Unable to connect to overcloud keystone.')
             return None
diff --git a/tuskar_ui/infrastructure/overview/forms.py b/tuskar_ui/infrastructure/overview/forms.py
index ca4362eb..2b5f9006 100644
--- a/tuskar_ui/infrastructure/overview/forms.py
+++ b/tuskar_ui/infrastructure/overview/forms.py
@@ -144,7 +144,7 @@ def validate_plan(request, plan):
         'status': lambda: 'ok' if roles_assigned else 'pending',
     })
     try:
-        controller_role = plan.get_role_by_name("controller")
+        controller_role = plan.get_role_by_name("Controller")
     except KeyError:
         messages.append({
             'text': _(u"Controller Role Needed."),
@@ -170,7 +170,7 @@ def validate_plan(request, plan):
             })
 
     try:
-        compute_role = plan.get_role_by_name("compute")
+        compute_role = plan.get_role_by_name("Compute")
     except KeyError:
         messages.append({
             'text': _(u"Compute Role Needed."),
@@ -214,8 +214,8 @@ class EditPlan(horizon.forms.SelfHandlingForm):
             field = django.forms.IntegerField(
                 label=role.name,
                 widget=tuskar_ui.forms.NumberPickerInput(attrs={
-                    'min': 1 if role.name in ('controller', 'compute') else 0,
-                    'step': 2 if role.name == 'controller' else 1,
+                    'min': 1 if role.name in ('Controller', 'Compute') else 0,
+                    'step': 2 if role.name == 'Controller' else 1,
                 }),
                 initial=plan.get_role_node_count(role),
                 required=False
@@ -233,9 +233,9 @@ class EditPlan(horizon.forms.SelfHandlingForm):
         # parameter which enables Neutron L3 HA when the number of
         # Controllers is > 1
         try:
-            controller_role = self.plan.get_role_by_name('controller')
+            controller_role = self.plan.get_role_by_name('Controller')
         except Exception as e:
-            LOG.warning('Unable to find role: %s', 'controller')
+            LOG.warning('Unable to find role: %s', 'Controller')
         else:
             if parameters[controller_role.node_count_parameter_name] > 1:
                 l3ha_param = controller_role.parameter_prefix + 'NeutronL3HA'
@@ -418,7 +418,7 @@ class PostDeployInit(horizon.forms.SelfHandlingForm):
     def handle(self, request, data):
         try:
             plan = api.tuskar.Plan.get_the_plan(request)
-            controller_role = plan.get_role_by_name("controller")
+            controller_role = plan.get_role_by_name("Controller")
             stack = api.heat.Stack.get_by_plan(self.request, plan)
 
             admin_token = plan.parameter_value(
diff --git a/tuskar_ui/infrastructure/overview/views.py b/tuskar_ui/infrastructure/overview/views.py
index 6cc09546..6e0c17f5 100644
--- a/tuskar_ui/infrastructure/overview/views.py
+++ b/tuskar_ui/infrastructure/overview/views.py
@@ -213,7 +213,7 @@ class IndexView(horizon.forms.ModalFormView, views.StackMixin):
                 if not stack.is_failed:
                     context['show_last_events'] = False
                 context['progress'] = 100
-                controller_role = plan.get_role_by_name("controller")
+                controller_role = plan.get_role_by_name("Controller")
                 context['admin_password'] = plan.parameter_value(
                     controller_role.parameter_prefix + 'AdminPassword')
 
diff --git a/tuskar_ui/infrastructure/parameters/views.py b/tuskar_ui/infrastructure/parameters/views.py
index 1d0240a6..b7748299 100644
--- a/tuskar_ui/infrastructure/parameters/views.py
+++ b/tuskar_ui/infrastructure/parameters/views.py
@@ -30,9 +30,9 @@ class SimpleServiceConfigView(horizon.forms.ModalFormView):
 
     def get_initial(self):
         plan = api.tuskar.Plan.get_the_plan(self.request)
-        compute_prefix = plan.get_role_by_name('compute').parameter_prefix
+        compute_prefix = plan.get_role_by_name('Compute').parameter_prefix
         controller_prefix = plan.get_role_by_name(
-            'controller').parameter_prefix
+            'Controller').parameter_prefix
 
         cinder_iscsi_helper = plan.parameter_value(
             controller_prefix + 'CinderISCSIHelper')