diff --git a/network.hipa b/network.hipa index c03f1b9..bf852eb 100644 --- a/network.hipa +++ b/network.hipa @@ -1,11 +1,11 @@ +#LH82 temp FACILITY="HIPA" # setup mount points -nfsMount "hipa-fs", "/export/hipa/ioc", "/ioc" -nfsMount "hipa-fs", "/export/hipa/work", "/hipa/work" -nfsMount "hipa-fs", "/export/gfa-epics/epics", "/epics" -nfsMount &sysBootHost, "/home/ioc", "/home/ioc" - -nfsAuthUnixSet &sysBootHost,500,9102 +nfsMount &sysBootHost, "/usr/local/epics","/epics" +nfsMount "gfa-vfs-ioc", "/export/hipa/ioc", "/ioc" +nfsMount "gfa-vfs-ioc", "/export/hipa/ioc_data", "/ioc/data" putenv "EPICS_CA_ADDR_LIST=172.19.10.255 172.19.30.255" putenv "EPICS_CA_AUTO_ADDR_LIST=NO" +putenv "EPICS_CAS_BEACON_ADDR_LIST=172.19.10.255 172.19.30.255" +putenv "EPICS_CAS_AUTO_BEACON_ADDR_LIST=NO" diff --git a/network.proscan b/network.proscan index a40a4b9..0c5f51f 100644 --- a/network.proscan +++ b/network.proscan @@ -1,9 +1,9 @@ # setup mount points -nfsMount "proscan-fs", "/export/proscan/ioc", "/ioc" -nfsMount "proscan-fs", "/export/proscan/work", "/proscan/work" -nfsMount "proscan-fs", "/export/proscan/prod", "/proscan/prod" -nfsMount "proscan-fs", "/export/gfa-epics/epics", "/epics" -nfsMount &sysBootHost, "/home/ioc", "/home/ioc" - +nfsMount &sysBootHost, "/usr/local/epics","/epics" +nfsMount "gfa-vfs-ioc","/export/proscan/ioc","/ioc" +nfsMount "gfa-vfs-ioc","/export/proscan/ioc_data","/ioc/data" putenv "EPICS_CA_AUTO_ADDR_LIST=NO" putenv "EPICS_CA_ADDR_LIST=172.25.11.255 172.25.60.255" +putenv "EPICS_CAS_AUTO_BEACON_ADDR_LIST=NO" +putenv "EPICS_CAS_BEACON_ADDR_LIST=172.25.11.255 172.25.60.255" +putenv "EPICS_CA_PUT_LOG_ADDR=gfa-syslog:1515 gfa-logstash:1515" diff --git a/network.sls b/network.sls index fb34c84..4b31a0f 100644 --- a/network.sls +++ b/network.sls @@ -1,22 +1,7 @@ -# Accept SLSBASE or INSTBASE -PBASE=0 -symFindByName sysSymTbl,"INSTBASE",&PBASE,0 -symFindByName sysSymTbl,"SLSBASE",&PBASE,0 -SLSBASE=*PBASE -INSTBASE=*PBASE - # Router for SLS machine net (fails otherwise but that's ok) routeAdd "0.0.0.0","172.20.10.1" -# setup mount points (try both possible locations for /ioc) -nfsMount &sysBootHost, "/home/ioc", "/home/ioc" -nfsMount "slsfs01", "/export/csa/releases/ioc", "/ioc" -nfsMount "slsfs01", "/export/csa/releases/work", "/work" -nfsMount "slsfs01", "/export/csa/releases/prod", "/prod" -nfsMount "slsfs01", "/export/csa/releases/devl", "/devl" -nfsMount "slsfs01", "/export/exchange", "/exchange" -nfsMount "slsfs01", "/export/gfa-epics/epics", "/epics" -nfsMount &sysBootHost, "/ioc", "/ioc" - -# overwrite driver module location -EPICS_MODULES = "/work/iocBoot/modules" +nfsMount "gfa-vfs-ioc", "/usr/local/epics","/epics" +nfsMount "gfa-vfs-ioc", "/export/sls/ioc", "/ioc" +nfsMount "gfa-vfs-ioc", "/export/sls/ioc_data", "/ioc/data" +nfsMount "gfa-vfs-ioc", "/export/sls/ioc_data", "/exchange"