Permalink
Browse files

Merge pull request #36 from galthaus/pull-req-release-rails3anddb-mas…

…ter-56c199bec1

More updates puma support controller cleanup [3/27]
  • Loading branch information...
2 parents ef319f6 + 56c199b commit 125237408c7a1739e4ea3909ae2e8653e4ad3635 @galthaus galthaus committed Aug 8, 2012
View
@@ -19,6 +19,7 @@ barclamp:
name: keystone
display: OpenStack Keystone
version: 0
+ allow_multiple_proposals: true
requires:
- mysql
member:
@@ -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
@@ -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"

0 comments on commit 1252374

Please sign in to comment.