From 6c57089218b6f5fbec0df9c5c942b687ae26cb42 Mon Sep 17 00:00:00 2001 From: cloudedge Date: Sun, 5 Aug 2012 13:12:49 -0700 Subject: [PATCH 1/2] keystone needs to be after mysql and before rest of OpenStack --- ...20120801015035_barclamp_import_keystone.rb | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 crowbar_framework/db/migrate/20120801015035_barclamp_import_keystone.rb diff --git a/crowbar_framework/db/migrate/20120801015035_barclamp_import_keystone.rb b/crowbar_framework/db/migrate/20120801015035_barclamp_import_keystone.rb deleted file mode 100644 index 247dab5f..00000000 --- a/crowbar_framework/db/migrate/20120801015035_barclamp_import_keystone.rb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2012, 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 BarclampImportKeystone < ActiveRecord::Migration - def up - Barclamp.import_1x 'keystone' - end - - def down - Barclamp.delete(Barclamp.find_by_name 'keystone') - end - -end From 0ffed1f5b438d1e633c14aff3981df3c7eb59ac8 Mon Sep 17 00:00:00 2001 From: cloudedge Date: Sun, 5 Aug 2012 13:31:07 -0700 Subject: [PATCH 2/2] keystone needs to be after mysql and before rest of OpenStack --- ...20120802030000_barclamp_import_keystone.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 crowbar_framework/db/migrate/20120802030000_barclamp_import_keystone.rb diff --git a/crowbar_framework/db/migrate/20120802030000_barclamp_import_keystone.rb b/crowbar_framework/db/migrate/20120802030000_barclamp_import_keystone.rb new file mode 100644 index 00000000..247dab5f --- /dev/null +++ b/crowbar_framework/db/migrate/20120802030000_barclamp_import_keystone.rb @@ -0,0 +1,24 @@ +# Copyright 2012, 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 BarclampImportKeystone < ActiveRecord::Migration + def up + Barclamp.import_1x 'keystone' + end + + def down + Barclamp.delete(Barclamp.find_by_name 'keystone') + end + +end