[node-patches] Change in ovirt-node[master]: Fix patch files for the puppet plugin

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Fix patch files for the puppet plugin
......................................................................

Fix patch files for the puppet plugin

Make sure the patches apply cleanly now that we've changed
ovirt-init-functions somewhat

Change-Id: I0938a85d9edf0ab1b672ef973831e9fd3e988403
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M ovirt-node.spec.in
M plugins/puppet-operatingsystem.rb.patch
2 files changed, 32 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/21/16521/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 7bde3fe..118bc85 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -150,10 +150,10 @@
 patch -p0 << EOF
 --- ovirt-init-functions.sh 2013-03-21 15:30:13.078014954 -0700
 +++ ovirt-init-functions-new.sh 2013-03-21 16:33:52.893135359 -0700
-@@ -223,6 +223,9 @@
-     #   rhn_proxyuser=PROXY-USERNAME
-     #   rhn_proxypassword=PROXY-PASSWORD
-     #   snmp_password=<authpassphrase>
+@@ -221,6 +221,9 @@
+     #   hostname=fqdn
+     #   tuned=profile
+     #   TBD logrotate maxsize
 +    #   puppet_enabled=<y|n>
 +    #   puppet_server=server
 +    #   puppet_certname=<certname>
@@ -195,11 +195,11 @@
              mem_overcommit* | ovirt_overcommit*)
              i=${i#mem_overcommit=}
              i=${i#ovirt_overcommit=}
-@@ -797,7 +821,7 @@
+@@ -772,7 +772,7 @@
 
 
      # save boot parameters as defaults for ovirt-config-*
--    params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot rhn_type rhn_url rhn_ca_cert rhn_username rhn_password rhn_profile rhn_activationkey rhn_org rhn_proxy rhn_proxyuser rhn_proxypassword runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install"
+-    params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install network_layout bond_name bond_slaves bond_options tuned_profile"
 +    params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot rhn_type rhn_url rhn_ca_cert rhn_username rhn_password rhn_profile rhn_activationkey rhn_org rhn_proxy rhn_proxyuser rhn_proxypassword runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install puppet_enabled puppet_server puppet_certname"
      # mount /config unless firstboot is forced
      if [ "$firstboot" != "1" ]; then
diff --git a/plugins/puppet-operatingsystem.rb.patch b/plugins/puppet-operatingsystem.rb.patch
index ff19ba5..c43c636 100644
--- a/plugins/puppet-operatingsystem.rb.patch
+++ b/plugins/puppet-operatingsystem.rb.patch
@@ -1,26 +1,27 @@
-    --- operatingsystem.rb  2013-03-19 16:12:46.610079038 -0700 124
-+++ operatingsystemnew.rb   2013-03-21 11:51:59.199657472 -0700 125
-@@ -10,6 +10,9 @@   126
- #  127
- # Caveats: 128
- #  129
-+#  130
-+\$LOAD_PATH.unshift('/var/lib/puppet/facts')   131
-+require 'ovirt.rb' 132
-133
- Facter.add(:operatingsystem) do    134
-   confine :kernel => :sunos    135
-@@ -25,7 +28,12 @@  136
- Facter.add(:operatingsystem) do    137
-   confine :kernel => :linux    138
-   setcode do   139
--    if Facter.value(:lsbdistid) == "Ubuntu"    140
-+    if FileTest.exists?("/etc/default/version")    141
-+        txt = File.read("/etc/default/version")    142
-+        if txt =~ /^PRODUCT='(.*?)\s/  143
-+            $1 144
-+        end    145
-+    elsif Facter.value(:lsbdistid) == "Ubuntu" 146
-        "Ubuntu"    147
-     elsif FileTest.exists?("/etc/debian_version")  148
+--- operatingsystem.rb	2013-07-05 13:05:07.943959513 -0700
++++ operatingsystem.rb	2013-07-05 13:18:54.106022794 -0700
+@@ -10,6 +10,8 @@
+ #
+ # Caveats:
+ #
++$LOAD_PATH.unshift('/var/lib/puppet/facts')
++require ovirt.rb
+ 
+ Facter.add(:operatingsystem) do
+   confine :kernel => :sunos
+@@ -25,8 +27,13 @@
+ Facter.add(:operatingsystem) do
+   confine :kernel => :linux
+   setcode do
+-    if Facter.value(:lsbdistid) == "Ubuntu"
+-       "Ubuntu"
++    if FileTest.exists?("/etc/default/version")
++      txt = File.read("/etc/default/version")
++      if txt =~ /^PRODUCT='(.*?)\s/ 
++          $1
++      end
++    elsif Facter.value(:lsbdistid) == "Ubuntu  
++      "Ubuntu"
+     elsif FileTest.exists?("/etc/debian_version")
        "Debian"
+     elsif FileTest.exists?("/etc/gentoo-release")


-- 
To view, visit http://gerrit.ovirt.org/16521
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0938a85d9edf0ab1b672ef973831e9fd3e988403
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>