Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 499bcbc29 -> 530aa4592


changed the project name for the migration from trafficops to pgmigration


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

Branch: refs/heads/master
Commit: 1441bd624810ce81a6f52b7722d53bdaeec7c579
Parents: a4a88e2
Author: Dewayne Richardson <dewr...@apache.org>
Authored: Mon Jan 30 10:53:11 2017 -0700
Committer: Jeremy Mitchell <mitchell...@gmail.com>
Committed: Mon Jan 30 10:58:07 2017 -0700

----------------------------------------------------------------------
 traffic_ops/app/db/pg-migration/migrate.sh      | 33 ++++++++++++--------
 .../app/db/pg-migration/mysql-to-postgres.sh    |  8 +++--
 2 files changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1441bd62/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 f2ee69e..26e38d2 100755
--- a/traffic_ops/app/db/pg-migration/migrate.sh
+++ b/traffic_ops/app/db/pg-migration/migrate.sh
@@ -20,6 +20,7 @@
 # Traffic Ops instances that is connected to the MySQL that 
 # you want to convert
 separator="---------------------------------------"
+docker_project="pgmigration"
 
 function display_env() {
 
@@ -46,13 +47,13 @@ function display_env() {
 
 function start_staging_mysql_server() {
 
-  docker-compose -p trafficops -f mysql_host.yml down
-  docker-compose -p trafficops -f mysql_host.yml up --build -d
+  docker-compose -p $docker_project -f mysql_host.yml down --remove-orphans
+  docker-compose -p $docker_project -f mysql_host.yml up --build -d
 
   #Wait for MySQL to come up
   export WAITER_HOST=$MYSQL_HOST
   export WAITER_PORT=$MYSQL_PORT
-  docker-compose -p trafficops -f waiter.yml up --build
+  docker-compose -p $docker_project -f waiter.yml up --build
   echo $separator
   echo "Mysql Host is started..."
   echo $separator
@@ -60,7 +61,7 @@ function start_staging_mysql_server() {
   #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
+  docker-compose -p $docker_project -f waiter.yml up --build
   echo $separator
   echo "Postgres Host is started..."
   echo $separator
@@ -72,8 +73,8 @@ function migrate_data_from_mysql_to_postgres() {
   echo $separator
   echo "Starting Mysql to Postgres Migration..."
   echo $separator
-  docker-compose -p trafficops -f mysql-to-postgres.yml down
-  docker-compose -p trafficops -f mysql-to-postgres.yml up --build
+  docker-compose -p $docker_project -f mysql-to-postgres.yml down
+  docker-compose -p $docker_project -f mysql-to-postgres.yml up --build
 }
 
 
@@ -81,7 +82,7 @@ function run_postgres_datatypes_conversion() {
   echo $separator
   echo "Starting Mysql to Postgres Datatype Conversion..."
   echo $separator
-  docker-compose -p trafficops -f convert.yml up --build
+  docker-compose -p $docker_project -f convert.yml up --build
 }
 
 
@@ -90,17 +91,23 @@ function clean() {
   echo "Cleaning up..."
   echo $separator
   #docker kill trafficops_mysql_host_1
-  docker-compose -p trafficops -f mysql-to-postgres.yml down 
-  docker-compose -p trafficops -f convert.yml down
+  docker-compose -p $docker_project -f mysql-to-postgres.yml down 
--remove-orphans
+  docker-compose -p $docker_project -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 rmi trafficops_mysql-to-postgres
-  docker rmi trafficops_convert 
+  IMAGE=$docker_project"_mysql-to-postgres"
+  echo "IMAGE: $IMAGE"
+  docker rmi $IMAGE
+  IMAGE=$docker_project"_convert"
+  docker rmi $IMAGE
   docker rmi mysql:5.6 
   docker rmi dimitri/pgloader:latest
-  docker rmi trafficops_mysql_host --force
-  docker rmi trafficops_waiter --force
+  IMAGE=$docker_project"_mysql_host"
+  docker rmi $IMAGE --force
+  IMAGE=$docker_project"_waiter"
+  docker rmi $IMAGE --force
 }
 
 clean

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1441bd62/traffic_ops/app/db/pg-migration/mysql-to-postgres.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/mysql-to-postgres.sh 
b/traffic_ops/app/db/pg-migration/mysql-to-postgres.sh
index 3e9b0d0..7ab7013 100755
--- a/traffic_ops/app/db/pg-migration/mysql-to-postgres.sh
+++ b/traffic_ops/app/db/pg-migration/mysql-to-postgres.sh
@@ -27,13 +27,15 @@ echo "----------------------------------------"
 echo "MYSQL_HOST: $MYSQL_HOST"
 echo "MYSQL_USER: $MYSQL_USER"
 echo "MYSQL_DATABASE: $MYSQL_DATABASE"
+echo "----------------------------------------"
 
 echo "----------------------------------------"
 echo "To Postgres..."
 echo "----------------------------------------"
-echo "mig:POSTGRES_HOST: $POSTGRES_HOST"
-echo "mig:POSTGRES_USER: $POSTGRES_USER"
-echo "mig:POSTGRES_DATABASE: $POSTGRES_DATABASE"
+echo "POSTGRES_HOST: $POSTGRES_HOST"
+echo "POSTGRES_USER: $POSTGRES_USER"
+echo "POSTGRES_DATABASE: $POSTGRES_DATABASE"
+echo "----------------------------------------"
 
 cat >$cred <<-CREDS
        { "u" : "$TO_USER", "p" : "$TO_PASSWORD" }

Reply via email to