autocommit Wed Feb 7 19:52:17 UTC 2018

7 files changed, 36 insertions, 12 deletions

diff --git a/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json b/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json
index 4220f67..d3c86ca 100644
--- a/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json
+++ b/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json
@@ -18,6 +18,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"
diff --git a/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json b/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json
index 93cc5a4..e158163 100644
--- a/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json
+++ b/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json
@@ -6,6 +6,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"
diff --git a/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json b/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json
index b525c2c..42920ed 100644
--- a/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json
+++ b/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json
@@ -18,6 +18,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"
diff --git a/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json b/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json
index 2958320..ad4f1d8 100644
--- a/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json
+++ b/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json
@@ -6,6 +6,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"
diff --git a/templates/database/etc/openbook/database/create_openbook_schemas.sql b/templates/database/etc/openbook/database/create_openbook_schemas.sql
index ed26552..54c72cb 100644
--- a/templates/database/etc/openbook/database/create_openbook_schemas.sql
+++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql
@@ -614,7 +614,8 @@ CREATE TABLE `t_metric_aggregate_customer_daily` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -686,7 +687,8 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -780,7 +782,8 @@ CREATE TABLE `t_metric_aggregate_resource_daily` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -855,7 +858,8 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -950,7 +954,8 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1023,7 +1028,8 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1061,8 +1067,7 @@ CREATE TABLE `t_metric_values` (
   KEY `ix_metric_values_3` (`metric_id`,`customer_id`,`service_region_id`,`metric_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`metric_datetime`))
-(PARTITION `p737088` VALUES LESS THAN (737088) ENGINE = InnoDB,
- PARTITION `p737089` VALUES LESS THAN (737089) ENGINE = InnoDB,
+(PARTITION `p737089` VALUES LESS THAN (737089) ENGINE = InnoDB,
  PARTITION `p737090` VALUES LESS THAN (737090) ENGINE = InnoDB,
  PARTITION `p737091` VALUES LESS THAN (737091) ENGINE = InnoDB,
  PARTITION `p737092` VALUES LESS THAN (737092) ENGINE = InnoDB,
@@ -1100,7 +1105,8 @@ CREATE TABLE `t_metric_values` (
  PARTITION `p737124` VALUES LESS THAN (737124) ENGINE = InnoDB,
  PARTITION `p737125` VALUES LESS THAN (737125) ENGINE = InnoDB,
  PARTITION `p737126` VALUES LESS THAN (737126) ENGINE = InnoDB,
- PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB);
+ PARTITION `p737127` VALUES LESS THAN (737127) ENGINE = InnoDB,
+ PARTITION `p737128` VALUES LESS THAN (737128) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1406,7 +1412,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=105439 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=105539 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 */;
@@ -1549,7 +1555,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=666 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=650 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 */;
@@ -1631,7 +1637,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=667 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=651 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/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json b/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json
index 1950709..b808ded 100644
--- a/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json
+++ b/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json
@@ -16,6 +16,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"
diff --git a/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json b/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json
index 4c6b56d..745b54f 100644
--- a/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json
+++ b/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json
@@ -16,6 +16,9 @@
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
     ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
 {% endif %}
+{% if openbook_disable_ssl_cert %}
+    ,"application.disableSSL": "true"
+{% endif %}
 {% if openbook_ssl_cert and openbook_ssl_key %}
     ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
     ,"ssl.key.path": "{{ openbook_ssl_key }}"