Dag, I'm merging this one, thanks for your contribution!. Next time please try not to break metadata syntax. :) (You were missing a </parameter> closing tag)
Cheers, Florian On 2010-05-06 01:49, Dag Stenstad wrote: > # HG changeset patch > # User Dag Stenstad <[email protected]> > # Date 1273072574 -7200 > # Node ID e595bc84f537eed53edec0a908a3c411c5fecc5c > # Parent 71d4971f6ba844825a7b81cc536124a97d352d5c > Low: RA: VirtualDomain: Add support for resolving FQDN of destination node > during migration. > > diff -r 71d4971f6ba8 -r e595bc84f537 heartbeat/VirtualDomain > --- a/heartbeat/VirtualDomain Wed Apr 21 13:16:38 2010 +0900 > +++ b/heartbeat/VirtualDomain Wed May 05 17:16:14 2010 +0200 > @@ -21,6 +21,7 @@ LANG="C" > # Defaults > OCF_RESKEY_force_stop_default=0 > OCF_RESKEY_hypervisor_default="$(virsh --quiet uri)" > +OCF_RESKEY_migrate_use_fqdn_default=0 > > : ${OCF_RESKEY_force_stop=${OCF_RESKEY_force_stop_default}} > : ${OCF_RESKEY_hypervisor=${OCF_RESKEY_hypervisor_default}} > @@ -85,6 +86,15 @@ use libvirt's default transport to conne > <shortdesc lang="en">Remote hypervisor transport</shortdesc> > <content type="string" default="" /> > </parameter> > + > +<parameter name="migrate_use_fqdn" unique="0" required="0"> > +<longdesc lang="en"> > +Use resolver to aquire a fully qualified domain name for the destination > node. > +Should be used if migration_transport is set to "ssl", and certificates are > +made out to the FQDN of the node. > +</longdesc> > +<shortdesc lang="en">Lookup remote node FQDN</shortdesc> > +<content type="boolean" default="${OCF_RESKEY_migrate_use_fqdn_default}" /> > > <parameter name="monitor_scripts" unique="0" required="0"> > <longdesc lang="en"> > @@ -279,6 +289,10 @@ VirtualDomain_Migrate_To() { > local transport_suffix > > target_node="$OCF_RESKEY_CRM_meta_migrate_target" > + if ocf_is_true $OCF_RESKEY_migrate_use_fqdn; then > + target_node=$(host $OCF_RESKEY_CRM_meta_migrate_target | \ > + awk '{ print $1; }') > + fi > > if VirtualDomain_Status; then > # Find out the remote hypervisor to connect to. That is, turn > _______________________________________________________ > Linux-HA-Dev: [email protected] > http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev > Home Page: http://linux-ha.org/ >
signature.asc
Description: OpenPGP digital signature
_______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
