From eee58f36b4c6203fa46ecb2e31471bb8eb80cdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 23 Nov 2012 15:37:08 +0000 Subject: [PATCH] Fix directory names --- stack/accords/instance-accords.cfg | 36 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/stack/accords/instance-accords.cfg b/stack/accords/instance-accords.cfg index 74a16b032..1d71ab9a4 100644 --- a/stack/accords/instance-accords.cfg +++ b/stack/accords/instance-accords.cfg @@ -22,13 +22,13 @@ domain = domain #password = $${slap-parameter:password} #domain = $${slap-parameter:domain} openstack_url = http://beta.enocloud.com:5000/v2.0/ -os-config = $${pocdirectory:poc}/os_config.xml +os-config = $${accordsdirectory:accords}/os_config.xml listen-ip = $${slap-network-information:local-ipv4} # Paths -accords-configuration-file = $${pocdirectory:poc}/accords.ini +accords-configuration-file = $${accordsdirectory:accords}/accords.ini manifest-source = ${accords-manifest:target} -manifest-destination = $${pocdirectory:poc}/manifest.xml +manifest-destination = $${accordsdirectory:accords}/manifest.xml manifest-name = manifest accords-wrapper = $${basedirectory:services}/accords testos-wrapper = $${rootdirectory:bin}/testos @@ -50,23 +50,26 @@ services = $${rootdirectory:etc}/run/ run = $${rootdirectory:var}/run/ backup = $${rootdirectory:srv}/backup/ -[pocdirectory] +[accordsdirectory] recipe = slapos.cookbook:mkdirectory -poc = $${rootdirectory:srv}/poc -rest = $${pocdirectory:poc}/rest -service = $${pocdirectory:poc}/service -security = $${pocdirectory:poc}/security +accords = $${rootdirectory:srv}/accords +rest = $${accordsdirectory:accords}/rest +service = $${accordsdirectory:accords}/service +security = $${accordsdirectory:accords}/security [copy-scripts] recipe = slapos.cookbook:copyfilelist -target-directory = $${pocdirectory:poc} +target-directory = $${accordsdirectory:accords} file-list = ${accords-scripts:location}/scripts/accords ${accords-scripts:location}/scripts/accords-config ${accords-scripts:location}/scripts/co-broker + ${accords-scripts:location}/scripts/co-check ${accords-scripts:location}/scripts/co-command ${accords-scripts:location}/scripts/co-parser - ${accords-scripts:location}/scripts/cords_user.xml + ${accords-scripts:location}/scripts/co-platform + ${accords-scripts:location}/scripts/co-provider + ${accords-scripts:location}/scripts/co-provision ${accords-scripts:location}/scripts/co-resolver ${accords-scripts:location}/scripts/co-start ${accords-scripts:location}/scripts/co-status @@ -74,17 +77,28 @@ file-list = ${accords-scripts:location}/scripts/run-azprocci ${accords-scripts:location}/scripts/run-broker ${accords-scripts:location}/scripts/run-coees - ${accords-scripts:location}/scripts/run-coes ${accords-scripts:location}/scripts/run-coips ${accords-scripts:location}/scripts/run-comons + ${accords-scripts:location}/scripts/run-conagios ${accords-scripts:location}/scripts/run-conets ${accords-scripts:location}/scripts/run-coobas + ${accords-scripts:location}/scripts/run-cool + ${accords-scripts:location}/scripts/run-copaas + ${accords-scripts:location}/scripts/run-cops ${accords-scripts:location}/scripts/run-cosacs + ${accords-scripts:location}/scripts/run-cosched ${accords-scripts:location}/scripts/run-coss + ${accords-scripts:location}/scripts/run-dcprocci ${accords-scripts:location}/scripts/run-ezvm ${accords-scripts:location}/scripts/run-fileserver + ${accords-scripts:location}/scripts/run-jpaasprocci ${accords-scripts:location}/scripts/run-onprocci + ${accords-scripts:location}/scripts/run-osocciprocci ${accords-scripts:location}/scripts/run-osprocci + ${accords-scripts:location}/scripts/run-paasprocci + ${accords-scripts:location}/scripts/run-paprocci ${accords-scripts:location}/scripts/run-parser ${accords-scripts:location}/scripts/run-procci ${accords-scripts:location}/scripts/run-publisher + ${accords-scripts:location}/scripts/openssl.cnf + ${accords-scripts:location}/scripts/run-slam -- 2.30.9