From 7b0423b4288684b30226788eb3a17cb3f433d480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Fri, 15 Jun 2012 18:52:54 +0200
Subject: [PATCH] frontend: send ipv4 + ipv6 connection in slaves.
Useful if owner of slave defined a custom domain and has to define by himself DNS entry.
---
slapos/recipe/apache_frontend/__init__.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/slapos/recipe/apache_frontend/__init__.py b/slapos/recipe/apache_frontend/__init__.py
index 83f4ef9f..d0589641 100644
--- a/slapos/recipe/apache_frontend/__init__.py
+++ b/slapos/recipe/apache_frontend/__init__.py
@@ -159,7 +159,12 @@ class Recipe(BaseSlapRecipe):
self.logger.debug("Sending connection parameters of slave "
"instance: %s" % reference)
try:
- self.setConnectionDict(dict(site_url=url), reference)
+ connection_dict = {
+ 'frontend_ipv6_address': self.getGlobalIPv6Address(),
+ 'frontend_ipv4_address': self.getLocalIPv4Address(),
+ 'site_url': url
+ }
+ self.setConnectionDict(connection_dict, reference)
except:
self.logger.fatal("Error while sending slave %s informations: %s",
reference, traceback.format_exc())
@@ -167,8 +172,8 @@ class Recipe(BaseSlapRecipe):
# Then set it for master instance
self.setConnectionDict(
dict(site_url=apache_parameter_dict["site_url"],
- domain_ipv6_address=self.getGlobalIPv6Address(),
- domain_ipv4_address=self.getLocalIPv4Address()))
+ frontend_ipv6_address=self.getGlobalIPv6Address(),
+ frontend_ipv4_address=self.getLocalIPv4Address()))
# Promises
promise_config = dict(
--
2.30.9