Merge remote-tracking branch 'origin/master' into erp5-component

software/erp5testnode/software.cfg

@@ -193,7 +193,7 @@ buildout-versions = 1.7
 cffi = 0.8.2
 cmd2 = 0.6.7
 cryptography = 0.4
-erp5.util = 0.4.39
+erp5.util = 0.4.40
 inotifyx = 0.2.0-1
 itsdangerous = 0.24
 lxml = 3.3.5

software/test-slave-instance-deployment/instance-default.cfg

+[buildout]
+parts =
+  publish-connection-informations
+  request-slave-instance
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+
+[request-test-instance]
+# Deploy a dummy instance
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Test Root Instance
+software-url = $${slap-connection:software-release-url}
+software-type = test
+return = foo slave-instance-list
+
+[request-slave-instance]
+# Deploy a dummy instance
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Test Root Instance - Slave
+software-url = $${slap-connection:software-release-url}
+software-type = test
+slave = true
+sla = instance_guid
+sla-instance_guid = $${request-test-instance:instance-guid}
+return = foo
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+note = test-instance-guid should be equal to XXX, test-instance-state should be equal to started, test-instance-slave-instance-list should be NOT empty, and root-instance-slave-instance-list SHOULD be empty, slave-instance-parameter should NOT be empty.
+test-instance-guid = $${request-test-instance:instance-guid}
+test-instance-state = $${request-test-instance:instance-state}
+test-instance-slave-instance-list = $${request-test-instance:connection-slave-instance-list}
+root-instance-slave-instance-list = $${slap-configuration:slave-instance-list}
+slave-instance-parameter = $${request-slave-instance:connection-foo}

software/test-slave-instance-deployment/instance-test.cfg

+[buildout]
+parts =
+  publish-connection-informations
+  publish-slave-information
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+foo = bar
+slave-instance-list = $${slap-configuration:slave-instance-list}
+
+[publish-slave-information]
+recipe = slapos.cookbook:publish
+# XXX hardcoded
+-slave-reference = slappart0_Test Root Instance - Slave
+foo = I am slave instance, and I am deployed!
\ No newline at end of file

software/test-slave-instance-deployment/instance.cfg

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${instance-default-profile:output}
+test = ${instance-test-profile:output}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = $${slap_connection:computer_id}
+partition-id = $${slap_connection:partition_id}
+server-url = $${slap_connection:server_url}
+software-release-url = $${slap_connection:software_release_url}
+key-file = $${slap_connection:key_file}
+cert-file = $${slap_connection:cert_file}

software/test-slave-instance-deployment/software.cfg

+# This Software Release is used to test
+# the behavior of Slave Instances in slapos and in slaprunner.
+[buildout]
+extends = ../../stack/slapos.cfg
+parts =
+  slapos-cookbook
+  instance-profile
+
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/instance.cfg
+mode = 0644
+
+[instance-default-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-default.cfg
+output = ${buildout:directory}/instance-default.cfg
+mode = 0644
+
+[instance-test-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-test.cfg
+output = ${buildout:directory}/instance-test.cfg
+mode = 0644
+
+[versions]
+Jinja2 = 2.7.3
+MarkupSafe = 0.23
+Werkzeug = 0.9.6
+buildout-versions = 1.7
+cffi = 0.8.6
+cliff = 1.6.1
+cmd2 = 0.6.7
+cryptography = 0.5.2
+inotifyx = 0.2.0-1
+itsdangerous = 0.24
+lxml = 3.3.5
+meld3 = 1.0.0
+mr.developer = 1.30
+netaddr = 0.7.12
+netifaces = 0.10.4
+pyOpenSSL = 0.14
+pyparsing = 2.0.2
+pytz = 2014.4
+requests = 2.3.0
+six = 1.7.3
+slapos.cookbook = 0.87
+slapos.core = 1.1.2
+slapos.recipe.cmmi = 0.2
+slapos.recipe.template = 2.5
+stevedore = 0.15
+supervisor = 3.1.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==1.1.2
+Flask = 0.10.1
+
+# Required by:
+# cliff==1.6.1
+argparse = 1.2.1
+
+# Required by:
+# slapos.cookbook==0.87
+lock-file = 2.0
+
+# Required by:
+# slapos.core==1.1.2
+psutil = 2.1.1
+
+# Required by:
+# cffi==0.8.6
+pycparser = 2.10
+
+# Required by:
+# slapos.core==1.1.2
+zope.interface = 4.1.1