[07/11] incubator-trafficcontrol git commit: updated for a cleaner migration

[mi...@apache.org]

updated for a cleaner migration


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/52a6e9b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/52a6e9b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/52a6e9b8

Branch: refs/heads/master
Commit: 52a6e9b8f09b7b2040d7d0ea0166ba8e5f1da634
Parents: 28272e5
Author: Dewayne Richardson <de...@apache.org>
Authored: Mon Jan 30 10:10:18 2017 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon Jan 30 10:58:07 2017 -0700

----------------------------------------------------------------------
 traffic_ops/app/db/pg-migration/migrate.sh        | 12 ++++++------
 traffic_ops/app/db/pg-migration/postgres.yml      |  4 ++--
 traffic_ops/app/db/pg-migration/start_postgres.sh |  4 +---
 3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/52a6e9b8/traffic_ops/app/db/pg-migration/migrate.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/migrate.sh b/traffic_ops/app/db/pg-migration/migrate.sh
index 1f40ecc..3649a3c 100755
--- a/traffic_ops/app/db/pg-migration/migrate.sh
+++ b/traffic_ops/app/db/pg-migration/migrate.sh
@@ -57,7 +57,7 @@ function start_staging_mysql_server() {
   echo "Mysql Host is started..."
   echo $separator
 
-  #Wait for Postgres to come up
+  #Ensure the Postgres instance is up
   export WAITER_HOST=$POSTGRES_HOST
   export WAITER_PORT=$POSTGRES_PORT
   docker-compose -p trafficops -f waiter.yml up --build
@@ -79,7 +79,7 @@ function migrate_data_from_mysql_to_postgres() {
 
 function run_postgres_datatypes_conversion() {
   echo $separator
-  echo "Starting Mysql to Postgres Migration..."
+  echo "Starting Mysql to Postgres Datatype Conversion..."
   echo $separator
   docker-compose -p trafficops -f convert.yml up --build
 }
@@ -89,12 +89,12 @@ function clean() {
   echo $separator
   echo "Cleaning up..."
   echo $separator
-  docker kill trafficops_mysql_host_1
+  #docker kill trafficops_mysql_host_1
   docker-compose -p trafficops -f mysql-to-postgres.yml down --remove-orphans
   docker-compose -p trafficops -f convert.yml down --remove-orphans
-  docker rm trafficops_mysql-to-postgres_1 
-  docker rm trafficops_convert_1
-  docker rm trafficops_mysql_host_1
+  #docker rm trafficops_mysql-to-postgres_1 
+  #docker rm trafficops_convert_1
+  #docker rm trafficops_mysql_host_1
   docker rmi trafficops_mysql-to-postgres
   docker rmi trafficops_convert 
   docker rmi trafficops_mysql_host

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/52a6e9b8/traffic_ops/app/db/pg-migration/postgres.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/postgres.yml b/traffic_ops/app/db/pg-migration/postgres.yml
index fbcdd46..72a765e 100644
--- a/traffic_ops/app/db/pg-migration/postgres.yml
+++ b/traffic_ops/app/db/pg-migration/postgres.yml
@@ -23,8 +23,8 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - '$PGDATA_VOLUME:/opt/postgresql/data/pgdata'
-      - '$PGLOGS_VOLUME:/var/log/postgresql'
+      - ./pgdata:/opt/postgresql/data/pgdata
+      - ./postgres_logs:/var/log/postgresql
     networks:
       - default
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/52a6e9b8/traffic_ops/app/db/pg-migration/start_postgres.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/start_postgres.sh b/traffic_ops/app/db/pg-migration/start_postgres.sh
index f307fd0..f89d1f4 100755
--- a/traffic_ops/app/db/pg-migration/start_postgres.sh
+++ b/traffic_ops/app/db/pg-migration/start_postgres.sh
@@ -47,9 +47,7 @@ function start_staging_postgres_server() {
 
   docker-compose -v -p trafficops -f postgres.yml down
 
-  echo "PGDATA_VOLUME: $PGDATA_VOLUME"
-  echo "PGLOGS_VOLUME: $PGLOGS_VOLUME"
-  PGLOGS_VOLUME=$PGLOGS_VOLUME PGDATA_VOLUME=$PGDATA_VOLUME docker-compose -p trafficops -f postgres.yml up  -d
+  docker-compose -p trafficops -f postgres.yml up  -d --build
 
 }