From 63afe9f441338bd2993b0cbc17ca696aa5e43fbe Mon Sep 17 00:00:00 2001
From: Dmytro Dovbii <ddovbii@mirantis.com>
Date: Wed, 15 Apr 2015 10:39:58 +0300
Subject: [PATCH] Move dependency's 'deploy' call into the method 'deploy' of
 app

It is wrong to call deploy from getContainer.
Calls were moved into method deploy of class for
all applications which have dependencies in properties.

Change-Id: I6643bf20d3e014c6d19d44896a041f523d52cb42
---
 Applications/GuestBook/package/Classes/GuestBook.yaml      | 7 ++++++-
 .../PHPZendServer/package/Classes/DockerPHPZendServer.yaml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Applications/GuestBook/package/Classes/GuestBook.yaml b/Applications/GuestBook/package/Classes/GuestBook.yaml
index 824d454..4ca76a7 100644
--- a/Applications/GuestBook/package/Classes/GuestBook.yaml
+++ b/Applications/GuestBook/package/Classes/GuestBook.yaml
@@ -28,10 +28,15 @@ Methods:
       - $._scope: switch($.publish, $ => public, not $ => internal)
 
 
-  getContainer:
+  deploy:
     Body:
       - $.redisMaster.deploy()
       - $.redisSlave.deploy()
+      - $.super($.deploy())
+
+
+  getContainer:
+    Body:
       - $redisMasterLink: $.getConnectionTo($.redisMaster, 6379)
       - $redisSlaveLink: $.getConnectionTo($.redisSlave, 6379)
       - Return:
diff --git a/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml b/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml
index f8d2b43..ceb9a63 100644
--- a/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml
+++ b/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml
@@ -37,9 +37,14 @@ Methods:
       - $._scope: switch($.publish, $ => public, not $ => internal)
 
 
-  getContainer:
+  deploy:
     Body:
       - $.database.deploy()
+      - $.super($.deploy())
+
+
+  getContainer:
+    Body:
       - $dbLink: $.getConnectionTo($.database, 3306)
       - Return:
           name: $.name