diff options
3 files changed, 44 insertions, 36 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 0ec8225..cc47543 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 @@ -23,6 +23,10 @@ ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} ,"auth.type": "{{ openbook_auth_type }}" +{% if openbook_role_group_mappings is None %} + ,"role.group.mappings": null +{% else %} ,"role.group.mappings": {{ openbook_role_group_mappings }} +{% endif %} } 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 44b6555..3b55944 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 @@ -23,6 +23,10 @@ ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} ,"auth.type": "{{ openbook_auth_type }}" +{% if openbook_role_group_mappings is None %} + ,"role.group.mappings": null +{% else %} ,"role.group.mappings": {{ openbook_role_group_mappings }} +{% endif %} } diff --git a/templates/database/etc/openbook/database/create_openbook_schemas.sql b/templates/database/etc/openbook/database/create_openbook_schemas.sql index 15659be..6eda3bd 100644 --- a/templates/database/etc/openbook/database/create_openbook_schemas.sql +++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql @@ -87,7 +87,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=1897 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1903 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 */; @@ -290,7 +290,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=315563 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=315569 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 */; @@ -420,7 +420,7 @@ CREATE TABLE `t_host` ( `disk_allocation_ratio` decimal(6,2) DEFAULT NULL, PRIMARY KEY (`host_id`), KEY `ix_host_1` (`service_manager_id`,`service_region_id`,`host_foreign_id`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=1984 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1987 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 */; @@ -436,7 +436,7 @@ CREATE TABLE `t_host_attributes` ( `vm_count` int(11) NOT NULL, `socket_count` int(11) NOT NULL, PRIMARY KEY (`host_id`,`update_date`) -) ENGINE=InnoDB AUTO_INCREMENT=1984 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1987 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 */; @@ -559,9 +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 `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, +(PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, @@ -956,7 +954,9 @@ CREATE TABLE `t_metric_aggregate_customer_daily` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, +(PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, @@ -1065,7 +1063,9 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, +(PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, @@ -1501,7 +1499,9 @@ CREATE TABLE `t_metric_aggregate_resource_daily` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, +(PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, @@ -1613,7 +1611,9 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, +(PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, @@ -2050,7 +2048,9 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, +(PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, @@ -2160,7 +2158,9 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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,9 +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 `p737039` VALUES LESS THAN (737039) ENGINE = InnoDB, - PARTITION `p737040` VALUES LESS THAN (737040) ENGINE = InnoDB, - PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, +(PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, @@ -2237,7 +2235,9 @@ CREATE TABLE `t_metric_values` ( PARTITION `p737075` VALUES LESS THAN (737075) ENGINE = InnoDB, PARTITION `p737076` VALUES LESS THAN (737076) ENGINE = InnoDB, PARTITION `p737077` VALUES LESS THAN (737077) ENGINE = InnoDB, - PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB); + PARTITION `p737078` VALUES LESS THAN (737078) ENGINE = InnoDB, + PARTITION `p737079` VALUES LESS THAN (737079) ENGINE = InnoDB, + PARTITION `p737080` VALUES LESS THAN (737080) 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=87962 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=88230 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 */; @@ -2647,7 +2647,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=2107 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2113 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=863 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=869 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=840 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=869 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 */; |