Commit 1c542abc authored by Jondy Zhao's avatar Jondy Zhao

Fix netdrive-reporter couldn't create script

parent fbea4557
[buildout] [buildout]
parts = parts =
directory directory
reporter main
publish-connection-parameter publish-connection-parameter
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
...@@ -16,7 +16,7 @@ url = $${slap_connection:server_url} ...@@ -16,7 +16,7 @@ url = $${slap_connection:server_url}
key = $${slap_connection:key_file} key = $${slap_connection:key_file}
cert = $${slap_connection:cert_file} cert = $${slap_connection:cert_file}
configuration.name = anonymous configuration.name = Anonymous
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -24,19 +24,20 @@ etc = $${buildout:directory}/etc ...@@ -24,19 +24,20 @@ etc = $${buildout:directory}/etc
script = $${:etc}/run script = $${:etc}/run
service = $${:etc}/service service = $${:etc}/service
promise = $${:etc}/promise promise = $${:etc}/promise
report = $${buildout:directory}/var/xml_report
[main] [main]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/netdrive_reporter command-line = ${buildout:bin-directory}/netdrive-reporter
--master-url=$${instance-parameter:url} --master-url=$${instance-parameter:url}
--computer-id=$${instance-parameter:computer} --computer-id=$${instance-parameter:computer}
--cert-file=$${instance-parameter:cert} --cert-file=$${instance-parameter:cert}
--key-file=$${instance-parameter:key} --key-file=$${instance-parameter:key}
--report-interval=300 --report-path=$${directory:report}
--report-interval=300.0
--data-file=$${directory:etc}/data --data-file=$${directory:etc}/data
wrapper-path = $${directory:service}/netdrive-reporter wrapper-path = $${directory:service}/netdrive-reporter
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
name = Net Drive Usage Report -- $${instance-parameter:configuration.name}! name = Net Drive Usage Report -- $${instance-parameter:configuration.name}!
...@@ -7,16 +7,15 @@ parts = ...@@ -7,16 +7,15 @@ parts =
netdrive-usage-report netdrive-usage-report
instance-template instance-template
download-cache = /opt/download-cache
[netdrive-usage-report] [netdrive-usage-report]
recipe = z3c.recipe.scripts recipe = zc.recipe.egg
eggs = eggs =
slapos.core slapos.core
lxml lxml
netdrive.report zc.buildout
netdrive
# control scripts generation in order to avoid reinstalling bin/buildout
scripts =
netdrive_reporter = netreport:main
[instance-template] [instance-template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
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