[node-patches] Change in ovirt-node[puppet-ovirt-node-plugin]: Initial push of puppet plugin code to ovirt repo
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Mon Jun 3 08:22:59 UTC 2013
Fabian Deutsch has posted comments on this change.
Change subject: Initial push of puppet plugin code to ovirt repo
......................................................................
Patch Set 4: (13 inline comments)
In general this patch is looking good now!
There are justa couple of really small things to be cleaned up.
....................................................
Commit Message
Line 7: Initial push of puppet plugin code to ovirt repo
Line 8:
Line 9: Move puppet plugin location
Line 10:
Line 11: Change-Id: Icb639acf019a48e809fb983ab2124c6215c00157
Please add the Bug-Url: line
e.g.:
Bug-Url: <url to bugzilla.redhat.com... bug>
....................................................
File ovirt-node.spec.in
Line 119: This package provides a puppet plugin for use with %{product_family} image.
Line 120:
Line 121: %post plugin-puppet
Line 122: cd /usr/share/ruby/vendor_ruby/facter
Line 123: patch -p0 << EOF
Any objections against keeping this patch in a .patch file to not clutter the spec to much?
Line 124: --- operatingsystem.rb 2013-03-19 16:12:46.610079038 -0700
Line 125: +++ operatingsystemnew.rb 2013-03-21 11:51:59.199657472 -0700
Line 126: @@ -10,6 +10,9 @@
Line 127: #
Line 172: # snmp_password=<authpassphrase>
Line 173: + # puppet_enabled=<y|n>
Line 174: + # puppet_server=server
Line 175: + # puppet_certname=<certname>
Line 176:
a needless whitespace
Line 177: # BOOTIF=link|eth*|<MAC> (appended by pxelinux)
Line 178: # network boot interface is assumed to be on management network where
Line 179: @@ -329,6 +332,14 @@
Line 180: cim_passwd=
Line 178: # network boot interface is assumed to be on management network where
Line 179: @@ -329,6 +332,14 @@
Line 180: cim_passwd=
Line 181: cim_enabled=
Line 182:
another one
Line 183: + # Puppet related options
Line 184: + # puppet_enabled=y|n
Line 185: + # puppet_server=server
Line 186: + # puppet_certname=<certname>
Line 193: # or ip=dhcp|off
Line 194: @@ -613,6 +624,19 @@
Line 195: snmp_password=${i#snmp_password=}
Line 196: ;;
Line 197:
another one
Line 198: + puppet_enabled=n | puppet_enabled=0)
Line 199: + puppet_enabled=0
Line 200: + ;;
Line 201: + puppet_enabled* | puppet_enabled=y | puppet_enabled=1)
Line 211: mem_overcommit* | ovirt_overcommit*)
Line 212: i=${i#mem_overcommit=}
Line 213: i=${i#ovirt_overcommit=}
Line 214: @@ -797,7 +821,7 @@
Line 215:
another one
Line 216:
Line 217: # save boot parameters as defaults for ovirt-config-*
Line 218: - 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"
Line 219: + 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"
Line 212: i=${i#mem_overcommit=}
Line 213: i=${i#ovirt_overcommit=}
Line 214: @@ -797,7 +821,7 @@
Line 215:
Line 216:
and ... another one :)
Line 217: # save boot parameters as defaults for ovirt-config-*
Line 218: - 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"
Line 219: + 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"
Line 220: # mount /config unless firstboot is forced
....................................................
File plugins/ovirt.rb
Line 1: Facter.add(:operatingsystem) do
please add a license header
Line 2: has_weight 100_000_000
Line 3: confine :kernel => :linux
Line 4: setcode do
Line 5: if FileTest.exists?("/etc/system-release")
....................................................
File plugins/puppet_page.py
Line 29: Configure Puppet
Line 30: """
Line 31:
Line 32:
Line 33: LOGGER = logging.getLogger(__name__)
you can drop this, basically all clases inheriting from base.Base should have a self.logger.
Line 34:
Line 35:
Line 36: class Plugin(plugins.NodePlugin):
Line 37: _server = None
....................................................
File plugins/puppet/provider/lib/ovirt_node.rb
Line 1: require 'fileutils'
please add a license header
Line 2: require 'filetest'
Line 3: require 'augeas'
Line 4:
Line 5: Puppet::Type.type(:ovirt_node).provide(:ovirt) do
Line 60: def iscsi_initiator=(name)
Line 61: update_wrapper("iSCSI", name)
Line 62: end
Line 63:
Line 64: def ssh=(bool)
a trailing whitespace!
Line 65: # It needs to be ensured that #{bool} is either True or False (so a bool in py syntax)
Line 66: value = ""
Line 67: if bool
Line 68: value = "True"
Line 104:
Line 105: def ntp=(servers)
Line 106: update_wrapper("Timeservers", "[#{servers.join(", ")}]")
Line 107: end
Line 108:
whitespaces!
Line 109: def ntp=(servers)
Line 110: update_wrapper("Nameservers", "[#{servers.join(", ")}]")
Line 111: end
Line 112:
....................................................
File plugins/puppet/provider/type/ovirt_node.rb
Line 10: #GNU General Public License for more details.
Line 11: #
Line 12: #You should have received a copy of the GNU General Public License
Line 13: #along with this program. If not, see <http://www.gnu.org/licenses/>.
Line 14:
a whitespace!
Line 15: ensurable
Line 16:
Line 17: newparam(:address, :namevar => true) do
Line 18: desc "The address of the engine"
--
To view, visit http://gerrit.ovirt.org/14664
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icb639acf019a48e809fb983ab2124c6215c00157
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-node
Gerrit-Branch: puppet-ovirt-node-plugin
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Michael Burns <mburns at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
More information about the node-patches
mailing list