forked from crowbar-archive/barclamp-ApacheHadoop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix barclamp initialization and unix file format issues
- Loading branch information
Showing
1 changed file
with
37 additions
and
32 deletions.
There are no files selected for viewing
69 changes: 37 additions & 32 deletions
69
crowbar_framework/app/controllers/apachehadoop_controller.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,37 @@ | ||
| # | ||
| # Barclamp: apachehadoop | ||
| # Recipe: ApacheHadoop_controller.rb | ||
| # | ||
| # Copyright (c) 2012 Dell Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| class ApachehadoopController < BarclampController | ||
| def initialize | ||
| @service_object = ApachehadoopService.new logger | ||
| end | ||
|
|
||
| def index | ||
| @title = I18n.t('title', :scope=>'barclamp.apachehadoop.index') | ||
| super | ||
| end | ||
|
|
||
| end | ||
|
|
||
|
|
||
| # | ||
| # Barclamp: apachehadoop | ||
| # Recipe: ApacheHadoop_controller.rb | ||
| # | ||
| # Copyright (c) 2012 Dell Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| class ApachehadoopController < BarclampController | ||
| before_filter :set_service_object | ||
|
|
||
| def set_service_object | ||
| @service_object = ApachehadoopService.new logger | ||
| @service_object.bc_name = @bc_name | ||
| end | ||
|
|
||
| private :set_service_object | ||
|
|
||
| def index | ||
| @title = I18n.t('title', :scope=>'barclamp.apachehadoop.index') | ||
| super | ||
| end | ||
|
|
||
| end | ||
|
|
||
|
|