Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

More updates puma support controller cleanup [3/27] #36

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions crowbar.yml
Expand Up @@ -19,6 +19,7 @@ barclamp:
name: keystone
display: OpenStack Keystone
version: 0
allow_multiple_proposals: true
requires:
- mysql
member:
Expand Down
9 changes: 0 additions & 9 deletions crowbar_framework/app/controllers/keystone_controller.rb
Expand Up @@ -14,14 +14,5 @@
#

class KeystoneController < BarclampController
before_filter :set_service_object

def set_service_object
@service_object = KeystoneService.new logger
@service_object.bc_name = @bc_name
end

private :set_service_object

end

4 changes: 0 additions & 4 deletions crowbar_framework/app/models/keystone_service.rb
Expand Up @@ -20,10 +20,6 @@ def initialize(thelogger)
@logger = thelogger
end

def self.allow_multiple_proposals?
true
end

def proposal_dependencies(role)
answer = []
if role.default_attributes["keystone"]["sql_engine"] == "mysql"
Expand Down