autocommit Tue Dec 12 23:59:54 UTC 2017

12 files changed, 193 insertions, 46 deletions

diff --git a/inventory_json_develop.rb b/inventory_json_develop.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_develop.rb
+++ b/inventory_json_develop.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_develop_db.rb b/inventory_json_develop_db.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_develop_db.rb
+++ b/inventory_json_develop_db.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_master.rb b/inventory_json_master.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_master.rb
+++ b/inventory_json_master.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_master_db.rb b/inventory_json_master_db.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_master_db.rb
+++ b/inventory_json_master_db.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_stage.rb b/inventory_json_stage.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_stage.rb
+++ b/inventory_json_stage.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_stage_db.rb b/inventory_json_stage_db.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_stage_db.rb
+++ b/inventory_json_stage_db.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_unstable.rb b/inventory_json_unstable.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_unstable.rb
+++ b/inventory_json_unstable.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_unstable_db.rb b/inventory_json_unstable_db.rb
index 4a41f97..8d42c80 100755
--- a/inventory_json_unstable_db.rb
+++ b/inventory_json_unstable_db.rb
@@ -10,7 +10,7 @@ def doit()
         exit(1)
     end
     environ = ""
-    ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
         if File.basename($0).include?(env)
             environ = env
             break
diff --git a/inventory_json_v3_lab_db.rb b/inventory_json_v3_lab_db.rb
new file mode 100755
index 0000000..8d42c80
--- /dev/null
+++ b/inventory_json_v3_lab_db.rb
@@ -0,0 +1,49 @@
+#!/usr/bin/ruby
+
+require "json"
+require "yaml"
+
+def doit()
+    env_yaml_path = "#{File.dirname($0)}/conf/env.yaml"
+    if ! File.file?(env_yaml_path)
+        STDERR.puts "Unable to find env.yaml. Exiting."
+        exit(1)
+    end
+    environ = ""
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+        if File.basename($0).include?(env)
+            environ = env
+            break
+        end
+    end
+    if environ == ""
+        STDERR.puts "Unable to determine environment. Exiting."
+        exit(1)
+    end
+    globs = {}
+    hostvars = {}
+    outobj = {}
+    hosts_arr = []
+    yml = YAML.load_file(env_yaml_path)
+    yml["globals"].each do |key, value|
+        globs[key] = value
+    end
+    yml["environments"].each do |ee|
+        ee.each do |e, hosts|
+            if e == environ
+                hosts.each do |host_hash|
+                    host_hash.each do |host, attributes|
+                        hosts_arr.push(host)
+                        hostvars[host] = globs.merge(attributes)
+                    end
+                end
+            end
+        end
+    end
+    outobj["target"] = {"hosts" => hosts_arr}
+    outobj["_meta"] = {"hostvars" => hostvars}
+    puts outobj.to_json
+end
+
+doit()
+exit(0)
diff --git a/inventory_json_v3_prod_db.rb b/inventory_json_v3_prod_db.rb
new file mode 100755
index 0000000..8d42c80
--- /dev/null
+++ b/inventory_json_v3_prod_db.rb
@@ -0,0 +1,49 @@
+#!/usr/bin/ruby
+
+require "json"
+require "yaml"
+
+def doit()
+    env_yaml_path = "#{File.dirname($0)}/conf/env.yaml"
+    if ! File.file?(env_yaml_path)
+        STDERR.puts "Unable to find env.yaml. Exiting."
+        exit(1)
+    end
+    environ = ""
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+        if File.basename($0).include?(env)
+            environ = env
+            break
+        end
+    end
+    if environ == ""
+        STDERR.puts "Unable to determine environment. Exiting."
+        exit(1)
+    end
+    globs = {}
+    hostvars = {}
+    outobj = {}
+    hosts_arr = []
+    yml = YAML.load_file(env_yaml_path)
+    yml["globals"].each do |key, value|
+        globs[key] = value
+    end
+    yml["environments"].each do |ee|
+        ee.each do |e, hosts|
+            if e == environ
+                hosts.each do |host_hash|
+                    host_hash.each do |host, attributes|
+                        hosts_arr.push(host)
+                        hostvars[host] = globs.merge(attributes)
+                    end
+                end
+            end
+        end
+    end
+    outobj["target"] = {"hosts" => hosts_arr}
+    outobj["_meta"] = {"hostvars" => hostvars}
+    puts outobj.to_json
+end
+
+doit()
+exit(0)
diff --git a/inventory_json_v3_staging_db.rb b/inventory_json_v3_staging_db.rb
new file mode 100755
index 0000000..8d42c80
--- /dev/null
+++ b/inventory_json_v3_staging_db.rb
@@ -0,0 +1,49 @@
+#!/usr/bin/ruby
+
+require "json"
+require "yaml"
+
+def doit()
+    env_yaml_path = "#{File.dirname($0)}/conf/env.yaml"
+    if ! File.file?(env_yaml_path)
+        STDERR.puts "Unable to find env.yaml. Exiting."
+        exit(1)
+    end
+    environ = ""
+    ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env|
+        if File.basename($0).include?(env)
+            environ = env
+            break
+        end
+    end
+    if environ == ""
+        STDERR.puts "Unable to determine environment. Exiting."
+        exit(1)
+    end
+    globs = {}
+    hostvars = {}
+    outobj = {}
+    hosts_arr = []
+    yml = YAML.load_file(env_yaml_path)
+    yml["globals"].each do |key, value|
+        globs[key] = value
+    end
+    yml["environments"].each do |ee|
+        ee.each do |e, hosts|
+            if e == environ
+                hosts.each do |host_hash|
+                    host_hash.each do |host, attributes|
+                        hosts_arr.push(host)
+                        hostvars[host] = globs.merge(attributes)
+                    end
+                end
+            end
+        end
+    end
+    outobj["target"] = {"hosts" => hosts_arr}
+    outobj["_meta"] = {"hostvars" => hostvars}
+    puts outobj.to_json
+end
+
+doit()
+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 d41b8a6..cf40837 100644
--- a/templates/database/etc/openbook/database/create_openbook_schemas.sql
+++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql
@@ -559,10 +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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB,
- PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB,
- PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB,
- PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
+(PARTITION `p736674` VALUES LESS THAN (736674) 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,
@@ -956,7 +953,10 @@ CREATE TABLE `t_metric_aggregate_customer_daily` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -973,10 +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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB,
- PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB,
- PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB,
- PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
+(PARTITION `p736979` VALUES LESS THAN (736979) 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,
@@ -1065,7 +1062,10 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1104,10 +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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB,
- PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB,
- PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB,
- PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
+(PARTITION `p736674` VALUES LESS THAN (736674) 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,
@@ -1501,7 +1498,10 @@ CREATE TABLE `t_metric_aggregate_resource_daily` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1521,10 +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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB,
- PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB,
- PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB,
- PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
+(PARTITION `p736979` VALUES LESS THAN (736979) 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,
@@ -1613,7 +1610,10 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1653,10 +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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB,
- PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB,
- PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB,
- PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB,
+(PARTITION `p736674` VALUES LESS THAN (736674) 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,
@@ -2050,7 +2047,10 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -2068,10 +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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB,
- PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB,
- PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB,
- PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB,
+(PARTITION `p736979` VALUES LESS THAN (736979) 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,
@@ -2160,7 +2157,10 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -2198,10 +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 `p737029` VALUES LESS THAN (737029) ENGINE = InnoDB,
- PARTITION `p737030` VALUES LESS THAN (737030) ENGINE = InnoDB,
- PARTITION `p737031` VALUES LESS THAN (737031) ENGINE = InnoDB,
- PARTITION `p737032` VALUES LESS THAN (737032) ENGINE = InnoDB,
+(PARTITION `p737032` VALUES LESS THAN (737032) 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,
@@ -2237,7 +2234,10 @@ CREATE TABLE `t_metric_values` (
  PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB,
  PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB,
  PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB,
- PARTITION `p737068` VALUES LESS THAN (737068) ENGINE = InnoDB);
+ 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);
 /*!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=86225 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=86543 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=827 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=797 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=827 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=797 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 */;