Move generic.nbdserver recipe to nbdserver

parent 52b43a24
...@@ -58,7 +58,7 @@ setup(name=name, ...@@ -58,7 +58,7 @@ setup(name=name,
'erp5testnode = slapos.recipe.erp5testnode:Recipe', 'erp5testnode = slapos.recipe.erp5testnode:Recipe',
'generate.mac = slapos.recipe.generatemac:Recipe', 'generate.mac = slapos.recipe.generatemac:Recipe',
'generic.kvm.frontend = slapos.recipe.generic_kvm_frontend:Recipe', 'generic.kvm.frontend = slapos.recipe.generic_kvm_frontend:Recipe',
'generic.nbdserver = slapos.recipe.generic_nbdserver:Recipe', 'nbdserver = slapos.recipe.nbdserver:Recipe',
'generic.novnc = slapos.recipe.generic_novnc:Recipe', 'generic.novnc = slapos.recipe.generic_novnc:Recipe',
'generic.onetimeupload = slapos.recipe.generic_onetimeupload:Recipe', 'generic.onetimeupload = slapos.recipe.generic_onetimeupload:Recipe',
'helloworld = slapos.recipe.helloworld:Recipe', 'helloworld = slapos.recipe.helloworld:Recipe',
......
...@@ -25,7 +25,7 @@ services = $${rootdirectory:etc}/run ...@@ -25,7 +25,7 @@ services = $${rootdirectory:etc}/run
promises = $${rootdirectory:etc}/promise promises = $${rootdirectory:etc}/promise
[nbd-instance] [nbd-instance]
recipe = slapos.cookbook:generic.nbdserver recipe = slapos.cookbook:nbdserver
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 1024 port = 1024
image-path = $${onetimeupload-instance:image-path} image-path = $${onetimeupload-instance:image-path}
......
...@@ -183,7 +183,7 @@ mode = 0644 ...@@ -183,7 +183,7 @@ mode = 0644
[template-nbd] [template-nbd]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-nbd.cfg url = ${:_profile_base_location_}/instance-nbd.cfg
md5sum = 35bb719918248a90167b9c0c6a96ce75 md5sum = 7691fadfc8d4392c58ac1bf0ebd5aaf2
output = ${buildout:directory}/template-nbd.cfg output = ${buildout:directory}/template-nbd.cfg
mode = 0644 mode = 0644
......
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