Refactor, now using instance-default and libnetworkcache

software/cloudoootestnode/instance-default.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  testnode
+  certificate-authority
+
+[testnode]
+recipe = slapos.cookbook:cloudoootestnode
+
+slapos-directory = $${directory:slapos}
+working-directory = $${directory:testnode}
+proxy-host = $${slap-network-information:global-ipv6}
+proxy-port = 5000
+log-directory = $${directory:log}
+run-directory = $${directory:run}
+test-suite-master-url = $${slap-parameter:test-suite-master-url}
+test-suite-directory = $${directory:test-suite}
+test-suite-title = $${slap-parameter:test-suite-title}
+test-node-title = $${slap-parameter:test-node-title}
+test-suite = $${slap-parameter:test-suite}
+node-quantity = $${slap-parameter:node-quantity}
+project-title = $${slap-parameter:project-title}
+ipv4-address = $${slap-network-information:local-ipv4}
+ipv6-address = $${slap-network-information:global-ipv6}
+instance-dict = $${slap-parameter:instance-dict}
+repository-list = $${slap-parameter:vcs-repository-list}
+
+git-binary = ${git:location}/bin/git
+slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
+slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
+slapproxy-binary = ${buildout:bin-directory}/slapproxy
+svn-binary = ${subversion:location}/bin/svn
+svnversion-binary = ${subversion:location}/bin/svnversion
+testnode = ${buildout:bin-directory}/testnode
+zip-binary = ${zip:location}/bin/zip
+
+configuration-file = $${rootdirectory:etc}/cloudoootestnode.cfg
+log-file = $${basedirectory:log}/cloudoootestnode.log
+wrapper = $${basedirectory:services}/cloudoootestnode
+
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:ca-dir}/requests/
+private = $${directory:ca-dir}/private/
+certs = $${directory:ca-dir}/certs/
+newcerts = $${directory:ca-dir}/newcerts/
+crl = $${directory:ca-dir}/crl/
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+promises = $${rootdirectory:etc}/promise/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+slapos = $${rootdirectory:srv}/slapos/
+testnode = $${rootdirectory:srv}/testnode/
+test-suite = $${rootdirectory:srv}/test_suite/
+log = $${basedirectory:log}/testnode/
+run = $${basedirectory:run}/testnode/
+ca-dir = $${rootdirectory:srv}/ca/
+
+[slap-parameter]
+node-quantity = 1
+test-suite-master-url =
+instance-dict =
+vcs-repository-list = 
+project-title = Cloudooo R&D
+test-suite = Cloudooo
+test-node-title = Cloudooo-Master
+test-suite-title = Cloudooo-MASTER

software/cloudoootestnode/instance.cfg

 [buildout]
+parts =
+  switch_softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-parts =
-  testnode
-  certificate-authority
-
-[testnode]
-recipe = slapos.cookbook:cloudoootestnode
-
-slapos-directory = $${directory:slapos}
-working-directory = $${directory:testnode}
-proxy-host = $${slap-network-information:global-ipv6}
-proxy-port = 5000
-log-directory = $${directory:log}
-run-directory = $${directory:run}
-test-suite-master-url = $${slap-parameter:test-suite-master-url}
-test-suite-directory = $${directory:test-suite}
-test-suite-title = $${slap-parameter:test-suite-title}
-test-node-title = $${slap-parameter:test-node-title}
-test-suite = $${slap-parameter:test-suite}
-node-quantity = $${slap-parameter:node-quantity}
-project-title = $${slap-parameter:project-title}
-ipv4-address = $${slap-network-information:local-ipv4}
-ipv6-address = $${slap-network-information:global-ipv6}
-instance-dict = $${slap-parameter:instance-dict}
-repository-list = $${slap-parameter:vcs-repository-list}
-
-git-binary = ${git:location}/bin/git
-slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
-slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
-slapproxy-binary = ${buildout:bin-directory}/slapproxy
-svn-binary = ${subversion:location}/bin/svn
-svnversion-binary = ${subversion:location}/bin/svnversion
-testnode = ${buildout:bin-directory}/testnode
-zip-binary = ${zip:location}/bin/zip
-
-configuration-file = $${rootdirectory:etc}/cloudoootestnode.cfg
-log-file = $${basedirectory:log}/cloudoootestnode.log
-wrapper = $${basedirectory:services}/cloudoootestnode
-
-
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests/
-private = $${directory:ca-dir}/private/
-certs = $${directory:ca-dir}/certs/
-newcerts = $${directory:ca-dir}/newcerts/
-crl = $${directory:ca-dir}/crl/
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-tmp = $${buildout:directory}/tmp/
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
-run = $${rootdirectory:var}/run/
-promises = $${rootdirectory:etc}/promise/
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-slapos = $${rootdirectory:srv}/slapos/
-testnode = $${rootdirectory:srv}/testnode/
-test-suite = $${rootdirectory:srv}/test_suite/
-log = $${basedirectory:log}/testnode/
-run = $${basedirectory:run}/testnode/
-
-[slap-parameter]
-node-quantity = 1
-test-suite-master-url =
-instance-dict =
-vcs-repository-list = []
-test-suite-title = $${:test-suite}
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-default:output}

software/cloudoootestnode/software.cfg

@@ -59,7 +59,7 @@ unzip = true
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.git ${:location} && ${git:location}/bin/git checkout cloudooo
+command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location}
 update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
 
 [check-recipe]
@@ -90,7 +90,14 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 65ad4e63bb609b0b60225d60b53e3ee6
+md5sum = 307663d73ef3ef94b02567ecd322252e
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-default.cfg
+output = ${buildout:directory}/template-default.cfg
+mode = 0644
+md5sum = 6d45e9ec0c82b91297967e45c6b3fd69
 
 [versions]
 # Use SlapOS patched zc.buildout
@@ -103,6 +110,7 @@ lxml = 2.3.2
 meld3 = 0.6.7
 slapos.cookbook = 0.38
 slapos.core = 0.21
+slapos.libnetworkcache = 0.11
 slapos.recipe.template = 2.2
 
 # Required by:
@@ -128,6 +136,7 @@ netifaces = 0.6
 # Required by:
 # slapos.cookbook==0.38
 # slapos.core==0.21
+# slapos.libnetworkcache==0.11
 # zc.buildout==1.6.0-dev-SlapOS-003
 setuptools = 0.6c12dev-r88846