Commit 10bec223 authored by Alain Takoudjou's avatar Alain Takoudjou

fix publish-connection-information tipo

parent b229fea1
......@@ -114,7 +114,7 @@ on-update = true
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
mode = 644
md5sum = 7071b61a862ee681c2e4323e6435e98d
md5sum = 450a50069f5617993ac8de47d533d653
download-only = true
on-update = true
......
......@@ -34,7 +34,7 @@ return =
# XXX: return ALL parameters (like nat rules), through jinja
backend-url url ip
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
backend-url = ${request-kvm:connection-backend-url}
url = ${request-kvm:connection-url}
......
......@@ -25,7 +25,7 @@ parts +=
promise
frontend-promise
content-promise
publish-connection-informations
publish-connection-information
{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
......@@ -45,7 +45,7 @@ wrapper = /bin/true
path = ${directory:www}
# Add "exporter" parameters to list of published connection parameters
[publish-connection-informations]
[publish-connection-information]
# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
# bubbles ALL
# parameters of the requested instance. Requirement: aggregated publish.
......
......@@ -13,7 +13,7 @@ parts =
frontend-promise
content-promise
publish-connection-informations
publish-connection-information
${custom-application-deployment:part-list}
......@@ -276,7 +276,7 @@ config-custom_domain = $${slap-parameter:domain}
#--
#-- Publish instance parameters.
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
backend_url = $${apache-php:url}
url = $${request-frontend:connection-site_url}
......
......@@ -74,7 +74,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum = b2564a719fdde097f402ef80e0991903
md5sum = 963ec2e460b281405b9e0e2748a27e62
mode = 0644
[instance-apache-import]
......@@ -96,7 +96,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = 24c5d0db063e5343a3cb0db9d5fbc738
md5sum = 00068d0f68a9e1eb5a6e89e73a3dc399
mode = 0644
[instance-resilient]
......@@ -112,7 +112,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = 5e2f917b032e43af6a736532966ae1f0
md5sum = f171782b98c1143d44ec2a35d8259254
mode = 0644
[instance-mariadb]
......
......@@ -11,7 +11,7 @@ offline = true
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
parts +=
{{ parts.replicate("apache", "3") }}
publish-connection-informations
publish-connection-information
{{ replicated.replicate("apache", "3", "apache-export", "apache-import") }}
......@@ -27,7 +27,7 @@ config-mariadb3-computer-guid = ${slap-parameter:mariadb3-computer-guid}
config-pbs-mariadb3-computer-guid = ${slap-parameter:pbs-mariadb3-computer-guid}
config-domain = ${slap-parameter:domain}
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
backend_url = ${request-apache:connection-backend_url}
url = ${request-apache:connection-url}
......
......@@ -25,7 +25,7 @@ parts +=
promise
frontend-promise
content-promise
publish-connection-informations
publish-connection-information
{{ replicated.replicate("postgres", "3", "postgres-export", "postgres-import") }}
......@@ -45,7 +45,7 @@ wrapper = /bin/true
path = ${directory:www}
# Add "exporter" parameters to list of published connection parameters
[publish-connection-informations]
[publish-connection-information]
# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
# bubbles ALL
# parameters of the requested instance. Requirement: aggregated publish.
......
......@@ -15,7 +15,7 @@ parts =
frontend-promise
content-promise
publish-connection-informations
publish-connection-information
${custom-application-deployment:part-list}
eggs-directory = ${buildout:eggs-directory}
......@@ -261,7 +261,7 @@ path = $${directory:report}/slapmonitor-xml
#--
#-- Publish instance parameters.
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
backend_url = $${apache-php:url}
url = $${request-frontend:connection-site_url}
......
......@@ -62,7 +62,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum = 7a0670c747f2f21a79c240bfbfbf9f6e
md5sum = 8b9e7ac376cad5235e88a45ece817e6b
mode = 0644
[instance-apache-import]
......@@ -84,7 +84,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = bdc7e126567ece6bf93a9bb493e29fac
md5sum = dca811871e293cf3ce1bfc52dd8dab64
mode = 0644
[instance-resilient]
......@@ -100,7 +100,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = 35bbf8cb40fe7185664641d82b406334
md5sum = e8fd20a32c87853ecba2846f50cd0898
mode = 0644
[instance-postgres]
......
......@@ -11,7 +11,7 @@ offline = true
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
parts +=
{{ parts.replicate("apache", "3") }}
publish-connection-informations
publish-connection-information
{{ replicated.replicate("apache", "3", "apache-export", "apache-import") }}
......@@ -28,7 +28,7 @@ config-pbs-postgres3-computer-guid = ${slap-parameter:pbs-postgres3-computer-gui
config-domain = ${slap-parameter:domain}
config-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file}
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
backend_url = ${request-apache:connection-backend_url}
url = ${request-apache:connection-url}
......
......@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/monitor.cfg.in
output = ${buildout:directory}/monitor.cfg
filename = monitor.cfg
md5sum = 51284c0aeb62eccd37f8a4e1621ee28c
md5sum = 9b31959560d3cde094199e267bbb013b
mode = 0644
[monitor-bin]
......
......@@ -288,3 +288,6 @@ curl_path = ${curl:location}/bin/curl
[publish-connection-informations]
recipe = slapos.cookbook:publish
monitor_url = $${monitor-parameters:url}
[publish-connection-information]
<= publish-connection-informations
......@@ -38,7 +38,7 @@ eggs = collective.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum = 7d7cb70cb76a41f853e74cc34a9ef428
md5sum = 4962204261e38c782c80ab9ca71410e9
mode = 0644
[pbsready-import]
......@@ -63,13 +63,13 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg
md5sum = 0e6a95e7a9b38d402f94c11b7d10397e
md5sum = 932acec2718e3daef839886b71e667cd
mode = 0644
[template-replicated]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/template-replicated.cfg.in
md5sum = 0641a65142fe0f624bf7c112081c2527
md5sum = 738f21e9fbfaee0d150d49da0afd7435
mode = 0644
destination = ${buildout:directory}/template-replicated.cfg.in
......
[buildout]
parts =
publish-connection-informations
publish-connection-information
pbs
logrotate
cron
......@@ -245,7 +245,7 @@ ignore-known-hosts-file = false
#--
#-- Publish instance parameters.
[publish-connection-informations]
[publish-connection-information]
recipe = slapos.cookbook:publish
ssh-key = $${sshkeys-dropbear:public-key-value}
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
......@@ -272,5 +272,5 @@ mode = 700
context =
key input_feed_directory directory:notifier-feeds
key monitor_feed_directory monitor-directory:public-cgi
key base_url publish-connection-informations:feeds-url
key base_url publish-connection-information:feeds-url
raw python_executable ${buildout:executable}
......@@ -97,7 +97,7 @@ sla-{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[publish-connection-informations]
[publish-connection-information]
feed-url-{{namebase}}-{{id}}-push = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id}
takeover-{{namebase}}-{{id}}-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-takeover-url}
takeover-{{namebase}}-{{id}}-password = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-takeover-password}
......@@ -208,7 +208,7 @@ config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older
slave = true
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
[publish-connection-informations]
[publish-connection-information]
feed-url-{{namebase}}-{{id}}-pull = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-pull-backup-server-{{namebase}}-{{id}}:config-notification-id}
......
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