On 08/26/2011 01:55 PM, Matt Wagner wrote:
---
src/db/migrate/20110329104633_rename_ssh_user.rb | 16 ++++++++++------
.../migrate/20110513160000_rename_rhevm_target.rb | 12 ++++++++----
...110707082304_rename_rhevm_and_vmware_targets.rb | 6 ++++--
.../migrate/20110811091500_rename_condorcloud.rb | 2 ++
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/db/migrate/20110329104633_rename_ssh_user.rb
b/src/db/migrate/20110329104633_rename_ssh_user.rb
index e77eae3..f13ae1f 100644
--- a/src/db/migrate/20110329104633_rename_ssh_user.rb
+++ b/src/db/migrate/20110329104633_rename_ssh_user.rb
@@ -1,15 +1,19 @@
class RenameSshUser< ActiveRecord::Migration
def self.up
pt = ProviderType.first(:conditions => {:codename => 'ec2'})
- pt.ssh_user = 'root'
- pt.home_dir = '/root'
- pt.save!
+ if pt
+ pt.ssh_user = 'root'
+ pt.home_dir = '/root'
+ pt.save!
+ end
end
def self.down
pt = ProviderType.first(:conditions => {:codename => 'ec2'})
- pt.ssh_user = 'ec2-user'
- pt.home_dir = '/home/ec2-user'
- pt.save!
+ if pt
+ pt.ssh_user = 'ec2-user'
+ pt.home_dir = '/home/ec2-user'
+ pt.save!
+ end
end
end
diff --git a/src/db/migrate/20110513160000_rename_rhevm_target.rb
b/src/db/migrate/20110513160000_rename_rhevm_target.rb
index 8d4ba5b..35f1912 100644
--- a/src/db/migrate/20110513160000_rename_rhevm_target.rb
+++ b/src/db/migrate/20110513160000_rename_rhevm_target.rb
@@ -2,14 +2,18 @@ class RenameRhevmTarget< ActiveRecord::Migration
def self.up
type = ProviderType.find_by_codename("rhevm")
- type.codename = "rhev-m"
- type.save
+ if type
+ type.codename = "rhev-m"
+ type.save
+ end
end
def self.down
type = ProviderType.find_by_codename("rhev-m")
- type.codename = "rhevm"
- type.save
+ if type
+ type.codename = "rhevm"
+ type.save
+ end
end
end
diff --git a/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
b/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
index 4394253..ef32882 100644
--- a/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
+++ b/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
@@ -12,8 +12,10 @@ class RenameRhevmAndVmwareTargets< ActiveRecord::Migration
def self.rename_type(old, new)
type = ProviderType.find_by_codename(old)
- type.codename = new
- type.save
+ if type
+ type.codename = new
+ type.save
+ end
end
end
diff --git a/src/db/migrate/20110811091500_rename_condorcloud.rb
b/src/db/migrate/20110811091500_rename_condorcloud.rb
index 332eef5..30c4762 100644
--- a/src/db/migrate/20110811091500_rename_condorcloud.rb
+++ b/src/db/migrate/20110811091500_rename_condorcloud.rb
@@ -1,5 +1,7 @@
class RenameCondorcloud< ActiveRecord::Migration
def self.up
+ # Not sure why this is necessary, but it is:
+ ProviderType.reset_column_information
condorcloud_type = ProviderType.find_by_deltacloud_driver('condorcloud')
if condorcloud_type
condorcloud_type.deltacloud_driver = "condor"
Ack.