Publish slave instance information in profile

software/apache-frontend/apache-slave-list.cfg.in

@@ -10,13 +10,16 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     ${:extra-context}
 
+# Loop trhought slave list to set up slaves
 {% for slave_instance in slave_instance_list -%}
 {%   set slave_reference = slave_instance.get('slave_reference') -%}
 {%   set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference -%}
 {%   set slave_parameter_dict = generic_instance_parameter_dict.copy() -%}
 {%   do part_list.append(slave_section_title) -%}
+# Set Up log files
 {%   do slave_parameter_dict.__setitem__('access_log', '/'.join([apache_log_directory, '%s_access_log' % slave_reference])) -%}
 {%   do slave_parameter_dict.__setitem__('error_log', '/'.join([apache_log_directory, '%s_error_log' % slave_reference])) -%}
+# Set up apache configuration file for slave
 [{{ slave_section_title }}]
 < = jinja2-template-base
 template = {{ template_slave_configuration }}
@@ -35,19 +38,20 @@ extra-context =
 {%       set cert_file = '/'.join([custom_ssl_directory, cert_title.replace('-','.')]) -%}
 {%       do part_list.append(cert_title) -%}
 {%       do slave_parameter_dict.__setitem__(cert_name, cert_file) -%}
+# Store certificates on fs
 [{{ cert_title }}]
 < = jinja2-template-base
 template = {{ empty_template }}
 rendered = {{ cert_file }}
 extra-context =
     key content {{ cert_title + '-config:value' }}
-
+# Store certificate in config
 [{{ cert_title + '-config' }}]
 value = {{ dumps(slave_instance.get(cert_name)) }}
 {%     endif -%}
 {%   endfor -%}
 
-# Set apache configuration for slave
+# Set apache configuration value for slave
 [{{ ('slave-instance-%s-configuration' % slave_reference) }}]
 {% set apache_custom_http = ((slave_instance.get('apache_custom_http', '')) % slave_parameter_dict) -%}
 {% set apache_custom_https = ((slave_instance.get('apache_custom_https', '')) % slave_parameter_dict) -%}
@@ -60,6 +64,14 @@ apache_custom_https = {{ dumps(apache_custom_https) }}
 {%     do cached_server_dict.__setitem__(slave_instance.get('domain'), slave_instance.get('url')) -%}
 {%   endif -%}
 
+# Publish slave information
+{%   set publish_section_title = 'publish-%s-connection-information' % slave_instance.get('slave_reference') -%}
+{%   do part_list.append(publish_section_title) -%}
+[{{ publish_section_title }}]
+recipe = slapos.cookbook:publish
+reference = {{ slave_instance.get('slave_reference') }}
+public-ipv4 = {{ public_ipv4 }}
+slave-reference = {{ slave_instance.get('slave_reference') }}
 {% endfor -%}
 
 

software/apache-frontend/instance.cfg

@@ -25,6 +25,7 @@ parts =
   promise-apache-frontend-v6-http
   promise-apache-cached
   promise-squid
+  publish-apache-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -109,6 +110,7 @@ extra-context =
     key apache_configuration_directory apache-directory:slave-configuration
     key http_port instance-parameter:configuration.plain_http_port
     key https_port instance-parameter:configuration.port
+    key public_ipv4 instance-parameter:configuration.public-ipv4
     key slave_instance_list instance-parameter:slave-instance-list
     key rewrite_cached_configuration apache-configuration:cached-rewrite-file
     key custom_ssl_directory apache-directory:vh-ssl
@@ -128,6 +130,7 @@ extra-context =
     key domain instance-parameter:configuration.domain
     key http_port instance-parameter:configuration.plain_http_port
     key https_port instance-parameter:configuration.port
+    key public_ipv4 instance-parameter:configuration.public-ipv4
     key slave_instance_list instance-parameter:slave-instance-list
     key rewrite_cached_configuration apache-configuration:cached-rewrite-file
     key custom_ssl_directory apache-directory:vh-ssl
@@ -249,6 +252,11 @@ cache-pid-file = $${directory:run}/httpd-cached.pid
 cache-port = 26010
 cache-through-port = 26011
 
+[publish-apache-information]
+recipe = slapos.cookbook:publish
+public-ipv4 = $${instance-parameter:configuration.public-ipv4}
+private-ipv4 = $${instance-parameter:ipv4-random}
+domain = $${instance-parameter:configuration.domain}
 
 # Create wrapper for "apachectl conftest" in bin
 [configtest]