From 3afc9dccbc2f73f4b930f231094b3f4d9fc37738 Mon Sep 17 00:00:00 2001
From: Nikolay Mahotkin <nmakhotkin@mirantis.com>
Date: Fri, 4 Mar 2016 12:11:19 +0300
Subject: [PATCH 1/2] Adding action for retrieving credentials

 * Action 'getCredentials' is added to LBaaS murano interface

Change-Id: I8c3c0ec804cd765a13cd5f5c3e03837b2a4f2636
---
 .../haproxy-based-lbaas/Classes/LoadBalancer.yaml  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/murano-apps/haproxy-based-lbaas/Classes/LoadBalancer.yaml b/murano-apps/haproxy-based-lbaas/Classes/LoadBalancer.yaml
index 513cfe9..d37c35a 100644
--- a/murano-apps/haproxy-based-lbaas/Classes/LoadBalancer.yaml
+++ b/murano-apps/haproxy-based-lbaas/Classes/LoadBalancer.yaml
@@ -38,6 +38,10 @@ Properties:
     Contract: $.class(std:Environment)
     Usage: Runtime
 
+  url:
+    Contract: $.string()
+    Usage: Out
+
 Methods:
   initialize:
     Body:
@@ -67,9 +71,17 @@ Methods:
           - $host: $.instance.floatingIpAddress
         Else:
           - $host: $.instance.ipAddresses[0]
-      - $.environment.reporter.report($this, format('LBaaS is available at http://{0}:{1}{2}', $host, $lbaas.port, $lbaas.path))
+      - $.url: format('http://{0}:{1}{2}', $host, $lbaas.port, $lbaas.path)
+      - $.environment.reporter.report($this, format('LBaaS is available at {0}', $.url))
       - $.setAttr(deployed, true)
 
+  getCredentials:
+    Usage: Action
+    Body:
+      - Return:
+          credentials:
+            uri: $.url
+
   installLoadBalancer:
 
   installLBaaS:

From 7d5fc50222f9157127c47f7d1311d847c9a3380d Mon Sep 17 00:00:00 2001
From: Nikolay Mahotkin <nmakhotkin@mirantis.com>
Date: Mon, 14 Mar 2016 16:28:03 +0300
Subject: [PATCH 2/2] LBaaS package: improving compatibility with liberty and
 mitaka releases

Change-Id: Id5123e469e7ec51b991f612d8dbd1058f0efbc5d
---
 murano-apps/haproxy-based-lbaas/Classes/HAProxy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/murano-apps/haproxy-based-lbaas/Classes/HAProxy.yaml b/murano-apps/haproxy-based-lbaas/Classes/HAProxy.yaml
index 8b7a8e2..68cdce8 100644
--- a/murano-apps/haproxy-based-lbaas/Classes/HAProxy.yaml
+++ b/murano-apps/haproxy-based-lbaas/Classes/HAProxy.yaml
@@ -18,7 +18,7 @@ Namespaces:
 
 Name: HAProxy
 
-Extends: =:LoadBalancer
+Extends: LoadBalancer
 
 Properties: