Remove keystone bits - more needed.

dellcloudedge · May 21, 2012 · b6c9b9d · b6c9b9d
1 parent 2a2dea8
commit b6c9b9d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/crowbar.yml b/crowbar.yml
@@ -43,10 +43,8 @@ locale_additions:
           default-tenant: Default Tenant
           admin-username: Administrator Username
           admin-password: Administrator Password
-          admin-token: Administrator Token (long-lived)
           default-username: Regular User Username
           default-password: Regular User Password
-          admin-token-expiration: Administrator Token Expiration
 
 debs:
   ubuntu-10.10:

diff --git a/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml
@@ -24,10 +24,4 @@
     %p
       %label{ :for => :admin_password  }= t('.admin-password')
       %input#admin_password{:type => "text", :name => "admin_password", :'data-default' => @proposal.raw_data['attributes'][@proposal.barclamp]["admin"]["password"], :onchange => "update_value('admin/password','admin_password', 'string')"}
-    %p
-      %label{ :for => :admin_token  }= t('.admin-token')
-      %input#admin_token{:type => "text", :name => "admin_token", :'data-default' => @proposal.raw_data['attributes'][@proposal.barclamp]["admin"]["token"], :onchange => "update_value('admin/token','admin_token','string')"}
-    %p
-      %label{ :for => :token_e  }= t('.admin-token-expiration')
-      %input#token_e{:type => "text", :name => "token_e", :'data-default' => @proposal.raw_data['attributes'][@proposal.barclamp]["admin"]["token-expiration"], :onchange => "update_value('admin/token-expiration','token_e','string')"}