From a153ac231a08af7d94043c20aa8e912169740a5d Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Wed, 6 Jul 2016 13:13:45 +0200
Subject: [PATCH] Refactor to use new deploy config in ccp

---
 ccp/ccp-deploy.sh      | 4 +++-
 mcp-deploy-config.yaml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 mcp-deploy-config.yaml

diff --git a/ccp/ccp-deploy.sh b/ccp/ccp-deploy.sh
index 26265117f..efa70283a 100755
--- a/ccp/ccp-deploy.sh
+++ b/ccp/ccp-deploy.sh
@@ -23,11 +23,13 @@ create_network_conf() {
 }
 
 assign_node_roles() {
+  all_label='openstack-compute-controller=true'
   for i in "${!nodes[@]}"
   do
     node=$i
     label=${nodes[$i]}
     kubectl get nodes $node --show-labels | grep -q "$label" || kubectl label nodes $node $label
+    kubectl get nodes $node --show-labels | grep -q "$all_label" || kubectl label nodes $node $all_label
   done
 }
 
@@ -38,7 +40,7 @@ delete_namespace() {
 }
 
 deploy_microservices() {
-  mcp-microservices --config-file=/root/mcp.conf deploy -t /root/cluster-topology.yaml &> /var/log/mcp-deploy.log
+  mcp-microservices --config-file=/root/mcp.conf --deploy-config=mcp-deploy-config.yaml deploy &> /var/log/mcp-deploy.log
 }
 
 create_network_conf
diff --git a/mcp-deploy-config.yaml b/mcp-deploy-config.yaml
new file mode 100644
index 000000000..c70dbc700
--- /dev/null
+++ b/mcp-deploy-config.yaml
@@ -0,0 +1,2 @@
+configs:
+  neutron_external_interface: eth1