fixed merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2178bbaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2178bbaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2178bbaf Branch: refs/heads/master Commit: 2178bbaf15339541f07af7a3251d71cd9ed3d0a1 Parents: a0eb24d Author: Dewayne Richardson <dewr...@apache.org> Authored: Fri Jan 27 13:53:30 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 | 66 -------------------- .../app/db/pg-migration/mysql-to-postgres.env | 4 -- 2 files changed, 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2178bbaf/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 a03884f..b0632e1 100755 --- a/traffic_ops/app/db/pg-migration/migrate.sh +++ b/traffic_ops/app/db/pg-migration/migrate.sh @@ -13,21 +13,14 @@ # limitations under the License. # -<<<<<<< HEAD . mysql-to-postgres.env -======= -: ${TO_SERVER?"Please set the TO_SERVER environment variable: ie: https://kabletown.net"} -: ${TO_USER?"Please set the TO_USER environment variable: ie: <your Traffic Ops userid>"} -: ${TO_PASSWORD?"Please set the TO_PASSWORD environment variable: ie: <your Traffic Ops password>"} MYSQL_PORT=3306 POSTGRES_PORT=5432 ->>>>>>> master separator="---------------------------------------" function shutdown_trafficops_database() { -<<<<<<< HEAD docker-compose -p trafficops -f postgres.yml down } @@ -56,53 +49,17 @@ function start_staging_postgres_server() { echo $separator echo "Postgres started.." echo $separator -======= - sudo systemctl stop trafficops-db } -function start_staging_mysql_server() { - docker-compose -p trafficops -f mysql_host.yml up --build -d - while [[ ! `netstat -lnt | grep :$MYSQL_PORT` ]]; do - # wait for signal that other container is waiting - echo "Waiting for Mysql to Start..." - sleep 3 - done - echo $separator - echo "Mysql Host is started..." - echo $separator -} - -function start_staging_postgres_server() { - sudo systemctl start trafficops-db - while [[ ! `netstat -lnt | grep :$POSTGRES_PORT` ]]; do - # wait for signal that other container is waiting - echo "Waiting for Postgres to Start..." - sleep 3 - done - echo $separator - echo "Postgres started.." - echo $separator ->>>>>>> master -} - - function run_postgres_datatypes_conversion() { -<<<<<<< HEAD - echo $separator - echo "Starting Mysql to Postgres Migration..." - echo $separator - docker-compose -p trafficops -f convert.yml up --build -======= echo $separator echo "Starting Mysql to Postgres Migration..." echo $separator docker-compose -p trafficops -f convert.yml up --build ->>>>>>> master } function migrate_data_from_mysql_to_postgres() { -<<<<<<< HEAD echo $separator echo "Starting Mysql to Postgres Migration..." echo $separator @@ -124,29 +81,6 @@ function clean() { docker rmi trafficops_mysql_host docker rmi mysql:5.6 docker rmi dimitri/pgloader:latest -======= - echo $separator - echo "Starting Mysql to Postgres Migration..." - echo $separator - docker-compose -p trafficops -f mysql-to-postgres.yml up --build -} - -function clean() { - echo $separator - echo "Cleaning up..." - echo $separator - 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 rmi trafficops_mysql-to-postgres - docker rmi trafficops_convert - docker rmi trafficops_mysql_host - docker rmi mysql:5.6 - docker rmi dimitri/pgloader:latest ->>>>>>> master } start_staging_mysql_server http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2178bbaf/traffic_ops/app/db/pg-migration/mysql-to-postgres.env ---------------------------------------------------------------------- diff --git a/traffic_ops/app/db/pg-migration/mysql-to-postgres.env b/traffic_ops/app/db/pg-migration/mysql-to-postgres.env index 75ec909..086e68e 100644 --- a/traffic_ops/app/db/pg-migration/mysql-to-postgres.env +++ b/traffic_ops/app/db/pg-migration/mysql-to-postgres.env @@ -40,8 +40,4 @@ POSTGRES_PORT=5432 POSTGRES_DATABASE=traffic_ops POSTGRES_USER=traffic_ops POSTGRES_PASSWORD=( your_new_postgres_password ) -<<<<<<< HEAD - PGDATA=/opt/postgresql/data/pgdata -======= ->>>>>>> master
