[Ovirt-devel] [PATCH] Changed the source for UUID to be dmidecode for now.

[Perry N. Myers]

Darryl L. Pierce wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  ovirt-host-creator/common-pkgs.ks            |    1 +
>  ovirt-host-creator/common-post.ks            |    3 ++-
>  ovirt-managed-node/src/ovirt-identify-node.c |    3 ++-
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/ovirt-host-creator/common-pkgs.ks b/ovirt-host-creator/common-pkgs.ks
> index 6fe4f26..3ad8fa0 100644
> --- a/ovirt-host-creator/common-pkgs.ks
> +++ b/ovirt-host-creator/common-pkgs.ks
> @@ -26,6 +26,7 @@ augeas
>  nc
>  bind-utils
>  syslinux
> +dmidecode
>  ovirt-managed-node
>  -policycoreutils
>  -audit-libs-python
> diff --git a/ovirt-host-creator/common-post.ks b/ovirt-host-creator/common-post.ks
> index a7dc987..3a6fde8 100644
> --- a/ovirt-host-creator/common-post.ks
> +++ b/ovirt-host-creator/common-post.ks
> @@ -237,7 +237,8 @@ start() {
>      echo -n $"Starting ovirt-post: "
>  
>      find_srv identify tcp
> -    ovirt-identify-node -s $SRV_HOST -p $SRV_PORT
> +    UUID=`/usr/sbin/dmidecode | grep -i uuid | awk '{ print $2; }'`
> +    ovirt-identify-node -s $SRV_HOST -p $SRV_PORT -u $UUID
>  
>      success
>      echo
> diff --git a/ovirt-managed-node/src/ovirt-identify-node.c b/ovirt-managed-node/src/ovirt-identify-node.c
> index 41dfec3..d46eeac 100644
> --- a/ovirt-managed-node/src/ovirt-identify-node.c
> +++ b/ovirt-managed-node/src/ovirt-identify-node.c
> @@ -124,7 +124,7 @@ int config(int argc,char** argv)
>      int result = 0;
>      int option;
>  
> -    while((option = getopt(argc,argv,"s:p:dvth")) != -1)
> +    while((option = getopt(argc,argv,"s:p:u:dvth")) != -1)
>      {
>          if(debug) fprintf(stdout,"Processing argument: %c (optarg:%s)\n",option,optarg);
>  
> @@ -132,6 +132,7 @@ int config(int argc,char** argv)
>          {
>              case 's': strcpy(hostname,optarg); break;
>              case 'p': hostport = atoi(optarg); break;
> +            case 'u': strcpy(uuid,optarg);     break;
>              case 't': testing  = 1; break;
>              case 'd': debug    = 1; break;
>              case 'v': verbose  = 1; break;

I thought this was problematic on VMs since they all have the same UUID? 
We should use dmidecode for UUID only if we're running on bare metal.  If 
running as the developer appliance (i.e. fake managed nodes) we should 
just use the hostname as UUID for now.

Perry

-- 
|=-        Red Hat, Engineering, Emerging Technologies, Boston        -=|
|=-                     Email: pmyers at redhat.com                      -=|
|=-         Office: +1 412 474 3552   Mobile: +1 703 362 9622         -=|
|=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=|