From 5de4464e958576914bbe8c1464731ce7f8849a3c Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Tue, 14 Nov 2017 00:23:26 +0000 Subject: autocommit Tue Nov 14 00:23:26 UTC 2017 --- templates/admin_api_server/run.sh | 2 +- templates/admin_web_ui/run.sh | 2 +- templates/customer_api_server/run.sh | 2 +- templates/customer_web_ui/run.sh | 2 +- .../etc/openbook/database/create_openbook_schemas.sql | 12 ++++++------ templates/database/run.sh | 2 +- templates/job_scheduler_server/run.sh | 2 +- templates/workflow_server/run.sh | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'templates') diff --git a/templates/admin_api_server/run.sh b/templates/admin_api_server/run.sh index 8270ff3..2e014b0 100755 --- a/templates/admin_api_server/run.sh +++ b/templates/admin_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server --name admin_api_server_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_admin_api_server_unstable +docker run -d --rm --net=host -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server --name admin_api_server_unstable docker-registry.pippiandcarlos.com/openbook_admin_api_server_unstable exit 0 diff --git a/templates/admin_web_ui/run.sh b/templates/admin_web_ui/run.sh index 51082d4..c7de25b 100755 --- a/templates/admin_web_ui/run.sh +++ b/templates/admin_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui --name admin_web_ui_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_admin_web_ui_unstable +docker run -d --rm --net=host -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui --name admin_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_admin_web_ui_unstable exit 0 diff --git a/templates/customer_api_server/run.sh b/templates/customer_api_server/run.sh index f773510..2884e62 100755 --- a/templates/customer_api_server/run.sh +++ b/templates/customer_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server --name customer_api_server_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_customer_api_server_unstable +docker run -d --rm --net=host -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server --name customer_api_server_unstable docker-registry.pippiandcarlos.com/openbook_customer_api_server_unstable exit 0 diff --git a/templates/customer_web_ui/run.sh b/templates/customer_web_ui/run.sh index afd0e86..3016f56 100755 --- a/templates/customer_web_ui/run.sh +++ b/templates/customer_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui --name customer_web_ui_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_customer_web_ui_unstable +docker run -d --rm --net=host -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui --name customer_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_customer_web_ui_unstable exit 0 diff --git a/templates/database/etc/openbook/database/create_openbook_schemas.sql b/templates/database/etc/openbook/database/create_openbook_schemas.sql index d3011e2..705a138 100644 --- a/templates/database/etc/openbook/database/create_openbook_schemas.sql +++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql @@ -83,7 +83,7 @@ CREATE TABLE `t_audit_event` ( PRIMARY KEY (`event_id`), KEY `ix_audit_event_1` (`event_time`,`event_type`,`entity_id`), KEY `ix_audit_event_2` (`user_id`,`event_time`) -) ENGINE=InnoDB AUTO_INCREMENT=1801 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1798 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -286,7 +286,7 @@ CREATE TABLE `t_customer` ( `registration_number` varchar(128) DEFAULT NULL, PRIMARY KEY (`customer_id`), UNIQUE KEY `ix_customer_3` (`management_region_id`,`customer_name`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=315465 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=315462 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1026,7 +1026,7 @@ CREATE TABLE `t_service_instance` ( PRIMARY KEY (`service_instance_id`), UNIQUE KEY `ix_provisioned_entity_1` (`service_manager_id`,`service_region_id`,`service_instance_foreign_id`(255)), KEY `ix_provisioned_entity_3` (`service_manager_id`) -) ENGINE=InnoDB AUTO_INCREMENT=82971 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=82254 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1129,7 +1129,7 @@ CREATE TABLE `t_tenant` ( KEY `ix_tenant_1` (`tenant_id`), KEY `ix_tenant_2` (`customer_id`), KEY `ix_tenant_3` (`service_manager_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1958 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1940 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1149,7 +1149,7 @@ CREATE TABLE `t_unbilled_charges` ( `payer_metadata` text DEFAULT NULL, PRIMARY KEY (`invoice_id`), KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`) -) ENGINE=InnoDB AUTO_INCREMENT=845 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=824 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1231,7 +1231,7 @@ CREATE TABLE `t_unbilled_charges_temp` ( `payer_metadata` text DEFAULT NULL, PRIMARY KEY (`invoice_id`), KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`) -) ENGINE=InnoDB AUTO_INCREMENT=845 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=824 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; diff --git a/templates/database/run.sh b/templates/database/run.sh index 9a61648..285aa3d 100755 --- a/templates/database/run.sh +++ b/templates/database/run.sh @@ -18,6 +18,6 @@ else mysql_args="--wsrep-new-cluster" fi -docker run -d --rm --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v /etc/openbook/database:/etc/mysql -v /var/lib/mysql:/var/lib/mysql -v /var/log/mysql:/var/log/mysql --name database openbook-docker-registry.verizoncloudplatform.com/openbook_database ${mysql_args} +docker run -d --rm --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v /etc/openbook/database:/etc/mysql -v /var/lib/mysql:/var/lib/mysql -v /var/log/mysql:/var/log/mysql --name database docker-registry.pippiandcarlos.com/openbook_database ${mysql_args} exit 0 diff --git a/templates/job_scheduler_server/run.sh b/templates/job_scheduler_server/run.sh index 25d5f60..e8276e1 100755 --- a/templates/job_scheduler_server/run.sh +++ b/templates/job_scheduler_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_job_scheduler_server_unstable +docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_unstable docker-registry.pippiandcarlos.com/openbook_job_scheduler_server_unstable exit 0 diff --git a/templates/workflow_server/run.sh b/templates/workflow_server/run.sh index e744cc9..c471480 100755 --- a/templates/workflow_server/run.sh +++ b/templates/workflow_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_unstable openbook-docker-registry.verizoncloudplatform.com/openbook_workflow_server_unstable +docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_unstable docker-registry.pippiandcarlos.com/openbook_workflow_server_unstable exit 0 -- cgit v1.3