autocommit Wed Dec 13 00:16:24 UTC 2017

3 files changed, 26 insertions, 26 deletions

diff --git a/templates/ci/openbookctl b/templates/ci/openbookctl
index b55b5bc..8199d1e 100755
--- a/templates/ci/openbookctl
+++ b/templates/ci/openbookctl
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo 'mysql root password: {{ openbook_database_password }}'
-echo 'wsrep_node_address: {{ ansible_default_ipv4.address }}'
+echo 'wsrep_node_address: {{ openbook_wsrep_node_address }}'
 echo 'wsrep_cluster_address: gcomm://{{ openbook_gcomm_addresses }}'
 
 {% if "True" == openbook_install_database|string() %}
diff --git a/templates/database/etc/openbook/database/conf.d/cluster.cnf b/templates/database/etc/openbook/database/conf.d/cluster.cnf
index cbc26a6..ea3d774 100644
--- a/templates/database/etc/openbook/database/conf.d/cluster.cnf
+++ b/templates/database/etc/openbook/database/conf.d/cluster.cnf
@@ -13,5 +13,5 @@ wsrep_provider=/usr/lib/galera/libgalera_smm.so
 wsrep_cluster_name="openbook_cluster"
 wsrep_cluster_address="gcomm://{{ openbook_gcomm_addresses }}"
 wsrep_sst_method=rsync
-wsrep_node_address="{{ ansible_default_ipv4.address }}"
+wsrep_node_address="{{ openbook_wsrep_node_address }}"
 wsrep_node_name="{{ ansible_hostname }}"
diff --git a/templates/database/etc/openbook/database/create_openbook_schemas.sql b/templates/database/etc/openbook/database/create_openbook_schemas.sql
index cf40837..bec504d 100644
--- a/templates/database/etc/openbook/database/create_openbook_schemas.sql
+++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql
@@ -559,8 +559,7 @@ CREATE TABLE `t_metric_aggregate_customer_daily` (
   PRIMARY KEY (`metric_id`,`customer_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
- PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
+(PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
  PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB,
  PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB,
  PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB,
@@ -956,7 +955,8 @@ CREATE TABLE `t_metric_aggregate_customer_daily` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -973,8 +973,7 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` (
   PRIMARY KEY (`metric_id`,`customer_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
- PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
+(PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
  PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB,
  PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB,
  PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB,
@@ -1065,7 +1064,8 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1104,8 +1104,7 @@ CREATE TABLE `t_metric_aggregate_resource_daily` (
   PRIMARY KEY (`metric_id`,`resource_id`,`resource_foreign_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
- PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
+(PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
  PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB,
  PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB,
  PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB,
@@ -1501,7 +1500,8 @@ CREATE TABLE `t_metric_aggregate_resource_daily` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1521,8 +1521,7 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` (
   PRIMARY KEY (`metric_id`,`resource_id`,`resource_foreign_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
- PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
+(PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
  PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB,
  PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB,
  PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB,
@@ -1613,7 +1612,8 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1653,8 +1653,7 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` (
   PRIMARY KEY (`metric_id`,`tenant_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
- PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
+(PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB,
  PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB,
  PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB,
  PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB,
@@ -2050,7 +2049,8 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -2068,8 +2068,7 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` (
   PRIMARY KEY (`metric_id`,`tenant_id`,`service_region_id`,`aggregate_datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
  PARTITION BY RANGE (to_days(`aggregate_datetime`))
-(PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
- PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
+(PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB,
  PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB,
  PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB,
  PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB,
@@ -2160,7 +2159,8 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -2198,8 +2198,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 `p737032` VALUES LESS THAN (737032) ENGINE = InnoDB,
- PARTITION `p737033` VALUES LESS THAN (737033) ENGINE = InnoDB,
+(PARTITION `p737033` VALUES LESS THAN (737033) ENGINE = InnoDB,
  PARTITION `p737034` VALUES LESS THAN (737034) ENGINE = InnoDB,
  PARTITION `p737035` VALUES LESS THAN (737035) ENGINE = InnoDB,
  PARTITION `p737036` VALUES LESS THAN (737036) ENGINE = InnoDB,
@@ -2237,7 +2236,8 @@ CREATE TABLE `t_metric_values` (
  PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB,
  PARTITION `p737069` VALUES LESS THAN (737069) ENGINE = InnoDB,
  PARTITION `p737070` VALUES LESS THAN (737070) ENGINE = InnoDB,
- PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB);
+ PARTITION `p737071` VALUES LESS THAN (737071) ENGINE = InnoDB,
+ PARTITION `p737072` VALUES LESS THAN (737072) ENGINE = InnoDB);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -2543,7 +2543,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=86543 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=86803 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 */;
@@ -2686,7 +2686,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=797 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=854 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 */;
@@ -2768,7 +2768,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=797 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=854 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 */;