Commit 4ea2476a authored by Łukasz Nowak's avatar Łukasz Nowak

stack/erp5: Publish SLAPOS_SOFTWARE_HOME instead OPENSSL_BINARY

OPENSSL_BINARY was backward compatibility apporach, but now modern
ERP5 code uses it only to find software home, so publish it with
SLAPOS_SOFTWARE_HOME directly.
parent ca11c7d1
......@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
filename = instance.cfg.in
md5sum = 278781b66fc7b208d9090005019abb7a
md5sum = 3d8c60b1ba27a3fe8e4849f11661223f
[monitor-template-dummy]
filename = dummy.cfg
......@@ -82,7 +82,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2
[template-zope]
filename = instance-zope.cfg.in
md5sum = 34b613d297a300d41c59c02ca12e6f84
md5sum = fa44b80f672cc4da790e0ee462772290
[template-balancer]
filename = instance-balancer.cfg.in
......
......@@ -443,7 +443,7 @@ wrapper-path = ${buildout:bin-directory}/runTestSuite
< = run-common
environment-extra =
REAL_INSTANCE_HOME=${:instance-home}
OPENSSL_BINARY={{ openssl_bin }}/openssl
SLAPOS_SOFTWARE_HOME=${buildout:directory}/software_release
TEST_CA_PATH=${directory:ca-dir}
instance-home = ${directory:unit-test-path}
wrapper-path = ${directory:bin}/${:command-name}.real
......
......@@ -118,7 +118,6 @@ extra-context =
import urlparse urlparse
import hashlib hashlib
import itertools itertools
raw openssl_bin {{ openssl_location}}/bin
[dynamic-template-kumofs-parameters]
<= default-dynamic-template-parameters
......
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