Permalink
Browse files

Merge pull request #2 from VictorLowther/pull-req-release-essex-hack-…

…master-5af1eef06d

Pull changes from development into essex-hack [1/16]
  • Loading branch information...
2 parents 1b99f7d + 5af1eef commit eff912cb6d2abc0fde3230f1b74509fdf0bd56b8 @galthaus galthaus committed Apr 5, 2012
Showing with 9 additions and 6 deletions.
  1. +3 −5 crowbar.yml
  2. +6 −1 crowbar_framework/app/controllers/openstack_controller.rb
View
@@ -24,21 +24,18 @@
barclamp:
name: openstack
display: OpenStack Master Environment
- description: Master barclamp that provides an umbrella for OpenStack components
+ description: OpenStack Project has multiple components
version: 0
user_managed: false
member:
- openstack
requires:
- @crowbar
- - nova
- nova_dashboard
- keystone
- - glance
- - swift
- - kong
os_support:
- ubuntu-10.10
+ - ubuntu-12.04
crowbar:
layout: 1
@@ -65,6 +62,7 @@ locale_additions:
noconfig: No Configuration Options
openstack:
index:
+ title: OpenStack
barclamp: Project
state: Status
proposal: Proposal
@@ -14,6 +14,11 @@
#
class OpenstackController < BarclampController
-
+
+ def index
+ @title = I18n.t('title', :scope=>'barclamp.openstack.index')
+ super
+ end
+
end

0 comments on commit eff912c

Please sign in to comment.