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

[mburns at redhat.com]

Michael Burns has posted comments on this change.

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


Patch Set 2: I would prefer that you didn't submit this

(3 inline comments)

....................................................
File ovirt-node.spec.in
Line 184: +            ;;
Line 185: +            puppet_enabled* | puppet_enabled=y | puppet_enabled=1)
Line 186: +            puppet_enabled=1
Line 187: +            ;;
Line 188: +            puppet_server=*)
Yes, I'd much prefer we use plugin_vars.  You can specify the names of the variables you want in a file in /etc/ovirt-commandline.d
Line 189: +            puppet_server=${i#puppet_server=}
Line 190: +            ;;
Line 191: +            puppet_certname=*)
Line 192: +            puppet_certname=${i#puppet_certname=}


Line 199: 
Line 200: 
Line 201:      # save boot parameters as defaults for ovirt-config-*
Line 202: -    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"
Line 203: +    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"
regardless of the move to ovirt-commandline.d, you're removing a lot of networking and tuned options from here that should not be removed.
Line 204:      # mount /config unless firstboot is forced
Line 205:      if [ "$firstboot" != "1" ]; then
Line 206:          mount_config
Line 207: @@ -855,6 +879,13 @@


Line 212: +        if [ `hostname` != "localhost" ] | [ -n $puppet_certname ]; then
Line 213: +            python -c "from ovirt.node.setup.puppet_page import *; ActivatePuppet()"
Line 214: +        else
Line 215: +            log "Puppet disabled. Hostname not set and puppet_certname not specified"
Line 216: +        fi
an install hook should handle this.
Line 217: +    fi
Line 218:      # check if root or admin password is expired, this might be upon reboot
Line 219:      # in case of automated installed with rootpw or adminpw parameter!
Line 220:      if LC_ALL=C chage -l root | grep  -q "password must be changed" \


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0938a85d9edf0ab1b672ef973831e9fd3e988403
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Michael Burns <mburns at redhat.com>