Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Tweak Daves fix for object initialization and fix some linux file format issues [4/29] #34

Merged
merged 1 commit into from

1 participant

@galthaus

.../app/controllers/keystone_controller.rb | 53 ++++++++++----------
1 files changed, 27 insertions(+), 26 deletions(-)

@galthaus galthaus merged commit ac6a6be into crowbar:release/rails3anddb/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 27 additions and 26 deletions.
  1. +27 −26 crowbar_framework/app/controllers/keystone_controller.rb
View
53 crowbar_framework/app/controllers/keystone_controller.rb
@@ -1,26 +1,27 @@
-# Copyright 2011, Dell
-#
-# 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 KeystoneController < BarclampController
- before_filter :set_service_object
-
- def set_service_object
- @service_object = KeystoneService.new logger
- end
-
- private :set_service_object
-
-end
-
+# Copyright 2011, Dell
+#
+# 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 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
+
Something went wrong with that request. Please try again.