git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Killed reference to pdb
[sfa.git]
/
config
/
sfa_config
diff --git
a/config/sfa_config
b/config/sfa_config
index
7c78b0f
..
a3d5055
100644
(file)
--- a/
config/sfa_config
+++ b/
config/sfa_config
@@
-1,98
+1,93
@@
-# Directory where SFA interfaces are installed
-GENI_BASE_DIR="/usr/share/sfa/"
-
# HRN
# Human readable name for the interfaces
# HRN
# Human readable name for the interfaces
-
GENI
_INTERFACE_HRN="plc"
+
SFA
_INTERFACE_HRN="plc"
# API Debug
# Are we logging
# API Debug
# Are we logging
-
GENI
_API_DEBUG=1
+
SFA
_API_DEBUG=1
# Registry Configuration
#
# Enabled
# Enable the registry interface
# Registry Configuration
#
# Enabled
# Enable the registry interface
-
GENI
_REGISTRY_ENABLED=1
+
SFA
_REGISTRY_ENABLED=1
# Root Auth
# The hrn of the registry's root auth
# Root Auth
# The hrn of the registry's root auth
-
GENI
_REGISTRY_ROOT_AUTH="plc"
+
SFA
_REGISTRY_ROOT_AUTH="plc"
# Level1 Auth
# The hrn of the registry's level1 auth
# xxx could be determined from hrn above
# Level1 Auth
# The hrn of the registry's level1 auth
# xxx could be determined from hrn above
-
GENI
_REGISTRY_LEVEL1_AUTH=""
+
SFA
_REGISTRY_LEVEL1_AUTH=""
# Hostname
# The fully qualified hostname of the registry server
# Hostname
# The fully qualified hostname of the registry server
-
GENI
_REGISTRY_HOST="localhost"
+
SFA
_REGISTRY_HOST="localhost"
# Port
# Geni registry port
# Port
# Geni registry port
-
GENI
_REGISTRY_PORT=12345
+
SFA
_REGISTRY_PORT=12345
## Aggregate Configuration
##
## Enable aggregate inteface
## Enable the aggregate inteface.
## Aggregate Configuration
##
## Enable aggregate inteface
## Enable the aggregate inteface.
-
GENI
_AGGREGATE_ENABLED=1
+
SFA
_AGGREGATE_ENABLED=1
#
## Hostname
## The fully qualified hostname of the aggregate server
#
## Hostname
## The fully qualified hostname of the aggregate server
-
GENI
_AGGREGATE_HOST="localhost"
+
SFA
_AGGREGATE_HOST="localhost"
#
## Port
## Geni aggregate server port
#
## Port
## Geni aggregate server port
-
GENI
_AGGREGATE_PORT=12346
+
SFA
_AGGREGATE_PORT=12346
# Slice Manager Configuration
#
# Enabled
# Enable the slice manager
# Slice Manager Configuration
#
# Enabled
# Enable the slice manager
-
GENI
_SM_ENABLED=1
+
SFA
_SM_ENABLED=1
# Host
## The fully qualified hostname or IP address of the slice manager server
# Host
## The fully qualified hostname or IP address of the slice manager server
-
GENI
_SM_HOST="localhost"
+
SFA
_SM_HOST="localhost"
# Port
# Geni slice manager server port
# Port
# Geni slice manager server port
-
GENI
_SM_PORT=12347
+
SFA
_SM_PORT=12347
# PLC Interface Access Configuration
#
# PLC user
# PLC Interface Access Configuration
#
# PLC user
-#
Valid plc account geni interfaces will use for plc requests
+#
sfa services will use this account for issuing plc requests - must have admin rights
-
GENI
_PLC_USER='root@localhost.localdomain'
+
SFA
_PLC_USER='root@localhost.localdomain'
# Password
# Password for user account
# Password
# Password for user account
-GENI_PLC_PASSWORD='root'
-
-# Hostname
-# Fully qualified hostname of PLC interface
-GENI_PLC_URL='https://localhost:443/PLCAPI/'
+SFA_PLC_PASSWORD='root'
-# PLC Shell PATH
-# Path of PLC shell. This only applies if Geni interfaces and PLC interface are running on the same
-# machine
-GENI_PLC_SHELL_PATH='/usr/share/plc_api'
+# Full URL of PLC interface
+SFA_PLC_URL='https://localhost:443/PLCAPI/'
# PLC DB Name
# PLC DB Name
-
GENI
_PLC_DB_NAME='planetlab5'
+
SFA
_PLC_DB_NAME='planetlab5'
# PLC DB Host
# PLC DB Host
-
GENI_PLC_DB_HOST='www.planet-lab.org
'
+
SFA_PLC_DB_HOST='localhost
'
# PLC DB port
# PLC DB port
-
GENI
_PLC_DB_PORT=5432
+
SFA
_PLC_DB_PORT=5432
# PLC DB User
# PLC DB User
-
GENI
_PLC_DB_USER='pgsqluser'
+
SFA
_PLC_DB_USER='pgsqluser'
# PLC DB Password
# PLC DB Password
-GENI_PLC_DB_PASSWORD=''
+SFA_PLC_DB_PASSWORD=''
+
+# Directory internal data gets stored
+# using /etc/sfa until gec5 but /usr/share/sfa would be a more reasonable choice
+SFA_BASE_DIR="/etc/sfa"