Commit b998b3ba authored by Kirill Smelkov's avatar Kirill Smelkov

X try to request redis instance (so far redis fails to instantiate)

parent f0ac1f96
......@@ -47,14 +47,12 @@ recipe = slapos.cookbook:publish
url = ${gitlab-backend:url}
# PostgreSQL instance
[request-postgresql]
<= slap-connection
recipe = slapos.cookbook:request
# TODO name = $(gitlab-name)/pgsql
name = g-pgsql
#software-url = $${slap-connection:software-release-url}/../../postgres/software.cfg
# TODO -> kill ..
#software-url = ${:_profile_base_location_}/../postgres/software.cfg
software-url = {{ urlparse.urljoin(software_release_url, '../postgres/software.cfg') }}
return = url
......@@ -63,6 +61,20 @@ recipe = slapos.cookbook:urlparse
url = ${request-postgresql:connection-url}
# Redis instance
[request-redis]
<= slap-connection
recipe = slapos.cookbook:request
# TODO name = $(gitlab-name)/pgsql
name = g-redis
software-url = {{ urlparse.urljoin(software_release_url, '../redis-server/software.cfg') }}
return = url
[redis-urlparse]
recipe = slapos.cookbook:urlparse
url = ${request-redis:connection-url}
# create gitlab dirs structure
[directory]
recipe = slapos.cookbook:mkdirectory
......@@ -105,6 +117,8 @@ aaa = ${request-postgresql:connection-url}
recipe = slapos.recipe.template
url = {{ gitlab_yml_in }}
output = ${gitlab:etc}/gitlab.yml
# FIXME aaa should not be here
aaa = ${request-redis:connection-url}
# TODO log: logrotate
......
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