Changeset 27b6aea


Ignore:
Timestamp:
Sep 11, 2008 5:07:31 PM (16 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02
Children:
c52c48d
Parents:
89d9502
Message:

seer private pubsub support

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • fedd/fedd_create_experiment.py

    r89d9502 r27b6aea  
    841841            fs = tbparams[master].get('fs', "fs")
    842842            event_server = "%s%s" % \
    843                     (tbparams[master].get('eventserver', "event_server"),
    844                             tbparams[master].get('domain', "example.com"))
     843                    (tbparams[gw].get('eventserver', "event_server"),
     844                            tbparams[gw].get('domain', "example.com"))
    845845            remote_event_server = "%s%s" % \
    846846                    (tbparams[dtb].get('eventserver', "event_server"),
    847847                            tbparams[dtb].get('domain', "example.com"))
    848 
     848            seer_control = "%s%s" % \
     849                    (tbparams[gw].get('control', "control"), sdomain)
    849850            remote_script_dir = "/proj/%s/exp/%s/tmp" % ( dproject, eid)
    850851            local_script_dir = "/proj/%s/exp/%s/tmp" % ( sproject, eid)
     
    876877            print >>gwconfig, "EventServerName: %s" % event_server
    877878            print >>gwconfig, "RemoteEventServerName: %s" % remote_event_server
     879            print >>gwconfig, "SeerControl: %s" % seer_control
    878880            print >>gwconfig, "Type: %s" % type
    879881            print >>gwconfig, "RemoteScriptDir: %s" % remote_script_dir
  • fedkit/fed-tun.pl

    r89d9502 r27b6aea  
    3434my $SMBFS_PORT = 139;
    3535my $PUBSUB_PORT = 16505;
     36my $SEER_PORT = 16606;
    3637
    3738
     
    126127    }
    127128
     129    # Forward connections to seer from remote TBs to control in this TB
     130    if (defined($opts{'seercontrol'})) {
     131        push(@ssh_port_fwds,"-R :$SEER_PORT:$opts{seercontrol}:$SEER_PORT");
     132    }
     133
    128134    @ssh_port_fwds = () if ($opts{'type'} eq 'experiment');
    129135
  • fedkit/federate.sh

    r89d9502 r27b6aea  
    5656
    5757# Find this experiment's stashed scripts.  (Perl for advanced parsing)
    58 SCRIPTDIR=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "/proj/$1/exp/$2/tmp\n";'`
     58PROJECT=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$1\n";'`
     59EXP=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$2\n";'`
     60SCRIPTDIR="/proj/$PROJECT/exp/$EXP/tmp"
    5961
    6062# Die if Scripts are not where they should be.  NB, this is checked by the
     
    6668fi
    6769
    68 # Copy the global hostnames file into /etc/hosts so this node can address
    69 # others in the experiment on other testbeds.  The extra steps preserves teh
    70 # localhost entry that's aliased to this host's name.
    71 grep 127\\.0\\.0\\.1 /etc/hosts > /tmp/hosts
    72 cat "$SCRIPTDIR/hosts" >> /tmp/hosts
    73 cp /tmp/hosts /etc/hosts && rm /tmp/hosts
    74 
    7570# Get our gateway, share, and mount user from the configuration file.
    7671# There's probably a way to get all three at once, but this works.
     
    7974SMBUSER=`$PERL -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
    8075SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
     76
     77GWIP=`host -N 10 $GATEWAY | $PERL -ne 's/.* has address // && print;'`
     78# Copy the global hostnames file into /etc/hosts so this node can address
     79# others in the experiment on other testbeds.  The extra steps preserves teh
     80# localhost entry that's aliased to this host's name.
     81grep 127\\.0\\.0\\.1 /etc/hosts > /tmp/hosts
     82cat "$SCRIPTDIR/hosts" >> /tmp/hosts
     83# If there's no node in this experiment called control, fake one so
     84# that SEER events get through (if SEER's in use)
     85if ! grep -q control $SCRIPTDIR/hosts; then
     86        echo "$GWIP     control.$EXP.$PROJECT" >> /tmp/hosts
     87fi
     88cp /tmp/hosts /etc/hosts && rm /tmp/hosts
    8189
    8290# XXX:
Note: See TracChangeset for help on using the changeset viewer.