Merge pull request #273 from lebauce/dedicated-router-ip

jprovaznik · web-flow · commit c18ea5c830a6 · 2016-10-12T13:17:58.000+02:00
Return non empty router_ip when using dedicated loadbalancer
diff --git a/ipfailover_keepalived.yaml b/ipfailover_keepalived.yaml
@@ -25,6 +25,9 @@ parameters:
     constraints:
     - custom_constraint: neutron.network
 
+  loadbalancer_ip:
+    type: string
+
 resources:
   router_vip_port:
     type: OS::Neutron::Port
diff --git a/ipfailover_none.yaml b/ipfailover_none.yaml
@@ -25,11 +25,14 @@ parameters:
     constraints:
     - custom_constraint: neutron.network
 
+  loadbalancer_ip:
+    type: string
+
 outputs:
   router_ip:
     description: >
       The Openshift Router external IP
-    value: ""
+    value: {get_param: loadbalancer_ip}
 
   router_vip:
     description: >
diff --git a/openshift.yaml b/openshift.yaml
@@ -476,6 +476,7 @@ resources:
       fixed_network: {get_resource: fixed_network}
       fixed_subnet: {get_resource: fixed_subnet}
       external_network: {get_param: external_network}
+      loadbalancer_ip: {get_attr: [lb_floating_ip, floating_ip_address]}
 
   # VM Host definitions
   bastion_host:
