Commit 1df27925 authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis
Browse files

deploy: Remove pithos_dir references



Since archipelago is the pithos backend, the NFS dir /srv/pithos
is useless. Cleanup everything related to it.
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parent 3a9cca82
......@@ -85,7 +85,6 @@
IMAGE_DIR=%IMAGE_DIR%
HELPER_SOFT_TIMEOUT=100
PITHOS_DB=postgresql://%SYNNEFO_USER%:%SYNNEFO_DB_PASSWD%@%DB_NODE%:5432/snf_pithos
PITHOS_DATA=%PITHOS_DIR%/data
PROGRESS_MONITOR=snf-progress-monitor
CURL="curl -k"
KVM="qemu-system-x86_64 -enable-kvm -machine pc-i440fx-2.0,accel=kvm"
PITHOS_BACKEND_DB_CONNECTION = 'postgresql://%SYNNEFO_USER%:%SYNNEFO_DB_PASSWD%@%DB_NODE%:5432/snf_pithos'
PITHOS_BACKEND_BLOCK_PATH = '%PITHOS_DIR%/data'
PITHOS_BACKEND_QUOTA = 20 * 1024 * 1024 * 1024
......@@ -35,7 +35,6 @@ CLOUDBAR_ACTIVE_SERVICE = '2'
CLOUDBAR_SERVICES_URL = 'https://%ACCOUNTS%/astakos/ui/get_services'
CLOUDBAR_MENU_URL = 'https://%ACCOUNTS%/astakos/ui/get_menu'
BACKEND_DB_CONNECTION = 'postgresql://%SYNNEFO_USER%:%SYNNEFO_DB_PASSWD%@%DB_NODE%:5432/snf_pithos'
BACKEND_BLOCK_PATH = '%PITHOS_DIR%/data/'
AMQP_HOSTS = ["amqp://%SYNNEFO_USER%:%SYNNEFO_RABBITMQ_PASSWD%@%MQ_NODE%:5672"]
......
%PITHOS_DIR% %IP%(rw,async,no_subtree_check,no_root_squash)
%IMAGE_DIR% %IP%(rw,async,no_subtree_check,no_root_squash)
......@@ -732,7 +732,6 @@ class Image(base.Component):
replace = {
"synnefo_user": config.synnefo_user,
"synnefo_db_passwd": config.synnefo_db_passwd,
"pithos_dir": config.pithos_dir,
"db_node": self.ctx.db.cname,
"image_dir": config.images_dir,
}
......@@ -1222,9 +1221,6 @@ class NFS(base.Component):
"mkdir -p %s" % config.images_dir,
"mkdir -p %s" % config.ganeti_dir,
"mkdir -p %s" % config.archip_dir,
"mkdir -p %s/data" % config.pithos_dir,
"chown www-data.www-data %s/data" % config.pithos_dir,
"chmod g+ws %s/data" % config.pithos_dir,
"cd %s && mkdir {maps,blocks,locks}" % config.archip_dir,
"cd %s && chown archipelago:archipelago {maps,blocks,locks}" % \
config.archip_dir,
......@@ -1289,7 +1285,6 @@ class Pithos(base.Component):
"db_node": self.ctx.db.cname,
"synnefo_user": config.synnefo_user,
"synnefo_db_passwd": config.synnefo_db_passwd,
"pithos_dir": config.pithos_dir,
"PITHOS_SERVICE_TOKEN": context.service_token,
"oa2_secret": config.oa2_secret,
}
......@@ -1331,7 +1326,6 @@ class PithosBackend(base.Component):
"db_node": self.ctx.db.cname,
"synnefo_user": config.synnefo_user,
"synnefo_db_passwd": config.synnefo_db_passwd,
"pithos_dir": config.pithos_dir,
}
return [
......@@ -1440,7 +1434,6 @@ snf-manage network-create --subnet6={0} \
"synnefo_user": config.synnefo_user,
"synnefo_db_passwd": config.synnefo_db_passwd,
"synnefo_rabbitmq_passwd": config.synnefo_rabbitmq_passwd,
"pithos_dir": config.pithos_dir,
"common_bridge": config.common_bridge,
"domain": self.node.domain,
"CYCLADES_SERVICE_TOKEN": context.service_token,
......
......@@ -144,7 +144,6 @@ def init(args):
config.jsonfile = "/tmp/service.json"
config.ganeti_dir = os.path.join(config.shared_dir, "ganeti")
config.images_dir = os.path.join(config.shared_dir, "images")
config.pithos_dir = os.path.join(config.shared_dir, "pithos")
config.archip_dir = os.path.join(config.shared_dir, "archip")
config.src_dir = os.path.join(config.shared_dir, "src")
......
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