All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit f5431f50 authored by Mike Hibler's avatar Mike Hibler

Move setting of IQN prefix to defs-* file.

No more hardwiring in bsdefs.h (which has been moved out
of the clientside dir since it is only used in tmcd.c).
parent a7dc2e0f
......@@ -68,3 +68,5 @@
#undef NOVIRTNFSMOUNTS
#undef WITHZFS
#undef WITHAMD
#undef BS_IQN_PREFIX
......@@ -656,20 +656,21 @@ TBROBOCOPSEMAIL_NOSLASH
TBROBOCOPSEMAIL
TBOPSEMAIL_NOSLASH
TBOPSEMAIL
IPV6_SUBNET_PREFIX
IPV6_ENABLED
NFSMAPTOUSER
IMAGEPROVENANCE
WITHZFS
ZFS_ROOT
ZFS_QUOTA_USER
ZFS_QUOTA_PROJECT
ZFS_QUOTA_GROUP
WITHAMD
BS_IQN_PREFIX
AMD_ROOT
WITHAMD
ZFS_QUOTA_GROUP
ZFS_QUOTA_PROJECT
ZFS_QUOTA_USER
ZFS_ROOT
WITHZFS
NOVIRTNFSMOUNTS
IMAGEDELTAS
PROFILEVERSIONS
IMAGEDELTAS
IMAGEPROVENANCE
NFSMAPTOUSER
IPV6_SUBNET_PREFIX
IPV6_ENABLED
BROWSER_CONSOLE_ENABLE
EC2META_ENABLE
NOSITECHECKIN
......@@ -4947,6 +4948,19 @@ done
......@@ -5113,6 +5127,7 @@ ZFS_QUOTA_PROJECT="100G"
ZFS_QUOTA_GROUP="10G"
WITHAMD=0
AMD_ROOT=/.amd_mnt
BS_IQN_PREFIX=iqn.2000-10.net.emulab
#
# XXX You really don't want to change these!
......@@ -5650,6 +5665,10 @@ cat >>confdefs.h <<_ACEOF
#define EVENTSERVER "$EVENTSERVER"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define BS_IQN_PREFIX "$BS_IQN_PREFIX"
_ACEOF
#
# Perl SelfLoader
......
......@@ -302,6 +302,7 @@ AC_SUBST(ZFS_QUOTA_PROJECT)
AC_SUBST(ZFS_QUOTA_GROUP)
AC_SUBST(WITHAMD)
AC_SUBST(AMD_ROOT)
AC_SUBST(BS_IQN_PREFIX)
#
# Offer both versions of the email addresses that have the @ escaped
......@@ -455,6 +456,7 @@ ZFS_QUOTA_PROJECT="100G"
ZFS_QUOTA_GROUP="10G"
WITHAMD=0
AMD_ROOT=/.amd_mnt
BS_IQN_PREFIX=iqn.2000-10.net.emulab
#
# XXX You really don't want to change these!
......@@ -789,6 +791,7 @@ if test -z "$EVENTSERVER"; then
EVENTSERVER="event-server"
fi
AC_DEFINE_UNQUOTED(EVENTSERVER, "$EVENTSERVER")
AC_DEFINE_UNQUOTED(BS_IQN_PREFIX, "$BS_IQN_PREFIX")
#
# Perl SelfLoader
......
......@@ -144,3 +144,6 @@ ZFS_QUOTA_PROJECT="100G"
ZFS_QUOTA_GROUP="10G"
WITHAMD=1
AMD_ROOT=/.amd_mnt/ops
# Blockstores
BS_IQN_PREFIX=iqn.2014-05.net.emulab.apt
......@@ -50,6 +50,11 @@ NOSHAREDFS=0
# If you don't know what this means, leave it at one, it won't hurt
NFSRACY=1
#
# IQN prefix for iSCSI blockstores
#
BS_IQN_PREFIX=iqn.2000-10.net.emulab
#
# Define a port range for frisbee use. You may want to do this if you
# have a firewall between boss and the nodes to limit the size of the
......
/*
* Copyright (c) 2013 University of Utah and the Flux Group.
* Copyright (c) 2013-2014 University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
......@@ -40,9 +40,12 @@
#define BS_PROTO_SAS "SAS"
/* Definitions related to iSCSI */
#define BS_IQN_PREFIX "iqn.2000-10.net.emulab" /* XXX: don't hardcode. */
#ifndef BS_IQN_PREFIX
#define BS_IQN_PREFIX "iqn.2000-10.net.emulab"
#endif
#define BS_IQN_MAXSIZE sizeof(BS_IQN_PREFIX) + TBDB_FLEN_PID + \
TBDB_FLEN_EID + TBDB_FLEN_BSVOL
#define BS_PERMS_ISCSI_RO "RO" /* read/write */
#define BS_PERMS_ISCSI_RW "RW" /* read/write */
#define BS_PERMS_ISCSI_DEF BS_PERMS_ISCSI_RW
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment