From b957bc5b33ec574b62353ab0a60e2cdf49f7e4c7 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Wed, 19 Oct 2016 18:10:26 +0000
Subject: [PATCH] Ports configuration refactoring

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I6dbc1a576356eb175f6e8d1d1c7b13cd13e05f35
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
---
 service/files/defaults.yaml   | 3 ++-
 service/files/my.cnf.j2       | 2 +-
 service/files/readiness.sh.j2 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 9f5d758..c2ba3b9 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -3,4 +3,5 @@ configs:
     max_timeout: 60
     root_password: password
   mariadb:
-    port: 3306
+    port:
+      cont: 3306
diff --git a/service/files/my.cnf.j2 b/service/files/my.cnf.j2
index a5eb514..dee93b7 100644
--- a/service/files/my.cnf.j2
+++ b/service/files/my.cnf.j2
@@ -1,6 +1,6 @@
 [mysqld]
 bind-address = {{ network_topology["private"]["address"] }}
-port = {{ mariadb.port }}
+port = {{ mariadb.port.cont }}
 
 datadir=/var/lib/mysql/
 log-error=/var/log/ccp/mysql/mysql.log
diff --git a/service/files/readiness.sh.j2 b/service/files/readiness.sh.j2
index 4744413..f9bdd68 100644
--- a/service/files/readiness.sh.j2
+++ b/service/files/readiness.sh.j2
@@ -1,3 +1,3 @@
 #!/bin/bash -e
 
-test -f /tmp/mariadb_ok && nc -z {{ network_topology["private"]["address"] }} {{ mariadb.port }}
+test -f /tmp/mariadb_ok && nc -z {{ network_topology["private"]["address"] }} {{ mariadb.port.cont }}