Browse files

Merge pull request #192 from lynxbat/plugin_api_fix

Detached Postinall final script pull from final postinstall checkin. (Ubuntu, Debian, Redhat, Centos)
  • Loading branch information...
2 parents 2441bd5 + 72c0f8c commit c7f146ab90018197e2a2ce833b212b0dc74a2901 @nanliu nanliu committed Sep 24, 2012
View
6 lib/project_razor/model/debian.rb
@@ -112,6 +112,9 @@ def postinstall_call
when "boot"
fsm_action(:os_boot, :postinstall)
return os_complete_script(@node)
+ when "final"
+ fsm_action(:os_final, :postinstall)
+ return ""
when "source_fix"
fsm_action(:source_fix, :postinstall)
return
@@ -161,7 +164,8 @@ def fsm_tree
:apt_get_upgrade => :postinstall,
:apt_get_ruby => :postinstall,
:postinstall_inject => :postinstall,
- :os_boot => :os_complete,
+ :os_boot => :postinstall,
+ :os_final => :os_complete,
:post_error => :error_catch,
:post_timeout => :timeout_error,
:error => :error_catch,
View
2 lib/project_razor/model/debian/wheezy/os_boot.erb
@@ -37,3 +37,5 @@ node_ip=`facter ipaddress`
curl <%= callback_url("postinstall", "send_ips") %>/$node_ip
# get final script
curl <%= callback_url("postinstall", "boot") %> | sh
+# Send final state
+curl <%= callback_url("postinstall", "final") %> &
View
3 lib/project_razor/model/opensuse_12.rb
@@ -150,9 +150,6 @@ def fsm_tree
:boot_call => :postinstall,
:yast_end => :postinstall,
:source_fix => :postinstall,
- :apt_get_update => :postinstall,
- :apt_get_upgrade => :postinstall,
- :apt_get_ruby => :postinstall,
:postinstall_inject => :postinstall,
:os_boot => :os_complete,
:post_error => :error_catch,
View
13 lib/project_razor/model/redhat.rb
@@ -112,9 +112,9 @@ def postinstall_call
when "boot"
fsm_action(:os_boot, :postinstall)
return os_complete_script(@node)
- when "source_fix"
- fsm_action(:source_fix, :postinstall)
- return
+ when "final"
+ fsm_action(:os_final, :postinstall)
+ return ""
when "send_ips"
#fsm_action(:source_fix, :postinstall)
# Grab IP string
@@ -156,12 +156,9 @@ def fsm_tree
:mk_call => :postinstall,
:boot_call => :postinstall,
:kickstart_end => :postinstall,
- :source_fix => :postinstall,
- :apt_get_update => :postinstall,
- :apt_get_upgrade => :postinstall,
- :apt_get_ruby => :postinstall,
:postinstall_inject => :postinstall,
- :os_boot => :os_complete,
+ :os_boot => :postinstall,
+ :os_final => :os_complete,
:post_error => :error_catch,
:post_timeout => :timeout_error,
:error => :error_catch,
View
2 lib/project_razor/model/redhat/6/os_boot.erb
@@ -32,3 +32,5 @@ node_ip=`facter ipaddress`
curl <%= callback_url("postinstall", "send_ips") %>/$node_ip
# get final script
curl <%= callback_url("postinstall", "boot") %> | sh
+# Send final state
+curl <%= callback_url("postinstall", "final") %> &
View
4 lib/project_razor/model/sles_11.rb
@@ -149,10 +149,6 @@ def fsm_tree
:mk_call => :postinstall,
:boot_call => :postinstall,
:yast_end => :postinstall,
- :source_fix => :postinstall,
- :apt_get_update => :postinstall,
- :apt_get_upgrade => :postinstall,
- :apt_get_ruby => :postinstall,
:postinstall_inject => :postinstall,
:os_boot => :os_complete,
:post_error => :error_catch,
View
6 lib/project_razor/model/ubuntu.rb
@@ -113,6 +113,9 @@ def postinstall_call
when "boot"
fsm_action(:os_boot, :postinstall)
return os_complete_script(@node)
+ when "final"
+ fsm_action(:os_final, :postinstall)
+ return ""
when "source_fix"
fsm_action(:source_fix, :postinstall)
return
@@ -162,7 +165,8 @@ def fsm_tree
:apt_get_upgrade => :postinstall,
:apt_get_ruby => :postinstall,
:postinstall_inject => :postinstall,
- :os_boot => :os_complete,
+ :os_boot => :postinstall,
+ :os_final => :os_complete,
:post_error => :error_catch,
:post_timeout => :timeout_error,
:error => :error_catch,
View
2 lib/project_razor/model/ubuntu/oneiric/os_boot.erb
@@ -32,3 +32,5 @@ node_ip=`facter ipaddress`
curl <%= callback_url("postinstall", "send_ips") %>/$node_ip
# get final script
curl <%= callback_url("postinstall", "boot") %> | sh
+# Send final state
+curl <%= callback_url("postinstall", "final") %> &
View
2 lib/project_razor/model/ubuntu/precise/os_boot.erb
@@ -32,3 +32,5 @@ node_ip=`facter ipaddress`
curl <%= callback_url("postinstall", "send_ips") %>/$node_ip
# get final script
curl <%= callback_url("postinstall", "boot") %> | sh
+# Send final state
+curl <%= callback_url("postinstall", "final") %> &
View
2 lib/project_razor/model/ubuntu/precise_ip_pool/os_boot.erb
@@ -45,3 +45,5 @@ node_ip=`facter ipaddress`
curl <%= callback_url("postinstall", "send_ips") %>/$node_ip
# get final script
curl <%= callback_url("postinstall", "boot") %> | sh
+# Send final state
+curl <%= callback_url("postinstall", "final") %> &

0 comments on commit c7f146a

Please sign in to comment.