From 4e9c29facbf6898047539a5a9405fd0a775ccfd7 Mon Sep 17 00:00:00 2001
From: Sergey Reshetnyak <sreshetniak@mirantis.com>
Date: Fri, 3 Oct 2014 10:58:47 +0400
Subject: [PATCH] Fix scaling with Heat and Neutron

Closes-bug: #1376829

Change-Id: Icbc950cc9e5f31871ea96dd1c7846fafdad444f4
---
 sahara/resources/neutron-port.heat                    |  3 ++-
 .../unit/resources/test_serialize_resources_aa.heat   | 11 +++++++----
 .../test_serialize_resources_use_neutron.heat         |  8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sahara/resources/neutron-port.heat b/sahara/resources/neutron-port.heat
index 48e1222431..44ea59bc74 100644
--- a/sahara/resources/neutron-port.heat
+++ b/sahara/resources/neutron-port.heat
@@ -2,6 +2,7 @@
             "Type" : "OS::Neutron::Port",
             "Properties" : {
                 %(security_groups)s
-               "network_id" : "%(fixed_net_id)s"
+               "network_id" : "%(fixed_net_id)s",
+               "replacement_policy": "AUTO"
             }
         }
diff --git a/sahara/tests/unit/resources/test_serialize_resources_aa.heat b/sahara/tests/unit/resources/test_serialize_resources_aa.heat
index 8ebb3f4f9f..89c5da097c 100644
--- a/sahara/tests/unit/resources/test_serialize_resources_aa.heat
+++ b/sahara/tests/unit/resources/test_serialize_resources_aa.heat
@@ -13,7 +13,8 @@
         "cluster-worker-001-port" : {
             "Type" : "OS::Neutron::Port",
             "Properties" : {
-               "network_id" : "private_net"
+               "network_id" : "private_net",
+               "replacement_policy": "AUTO"
             }
         },
         "cluster-worker-001-floating" : {
@@ -41,7 +42,8 @@
         "cluster-worker-002-port" : {
             "Type" : "OS::Neutron::Port",
             "Properties" : {
-               "network_id" : "private_net"
+               "network_id" : "private_net",
+               "replacement_policy": "AUTO"
             }
         },
         "cluster-worker-002-floating" : {
@@ -69,7 +71,8 @@
         "cluster-master-001-port" : {
             "Type" : "OS::Neutron::Port",
             "Properties" : {
-               "network_id" : "private_net"
+               "network_id" : "private_net",
+               "replacement_policy": "AUTO"
             }
         },
         "cluster-master-001-floating" : {
@@ -96,4 +99,4 @@
     },
 
     "Outputs" : {}
-}
\ No newline at end of file
+}
diff --git a/sahara/tests/unit/resources/test_serialize_resources_use_neutron.heat b/sahara/tests/unit/resources/test_serialize_resources_use_neutron.heat
index 551e92e354..6bdd7785ff 100644
--- a/sahara/tests/unit/resources/test_serialize_resources_use_neutron.heat
+++ b/sahara/tests/unit/resources/test_serialize_resources_use_neutron.heat
@@ -6,7 +6,8 @@
         "cluster-worker-001-port" : {
             "Type" : "OS::Neutron::Port",
             "Properties" : {
-               "network_id" : "private_net"
+               "network_id" : "private_net",
+               "replacement_policy": "AUTO"
             }
         },
         "cluster-worker-001-floating" : {
@@ -63,7 +64,8 @@
         "cluster-master-001-port" : {
             "Type" : "OS::Neutron::Port",
             "Properties" : {
-               "network_id" : "private_net"
+               "network_id" : "private_net",
+               "replacement_policy": "AUTO"
             }
         },
         "cluster-master-001-floating" : {
@@ -90,4 +92,4 @@
     },
 
     "Outputs" : {}
-}
\ No newline at end of file
+}