diff --git a/README.md b/README.md index d896902..a89ba51 100644 --- a/README.md +++ b/README.md @@ -146,9 +146,10 @@ It can be called like this: `ctx.env['cloud.platform'].install(cloud_platform_kind)` Replacing `cloud_platform_kind` with 'exoscale' or 'ovh' -When there was only Exoscale as a provider of the cloud platform the following -would do the trick and will work until v.11 : - `ctx.env['cloud.platform'].install_exoscale()` +Or using one of the direct shortcuts: + + * `ctx.env['cloud.platform'].install_exoscale()` + * `ctx.env['cloud.platform'].install_ovh()` ### Startup checks diff --git a/attachment_swift/__manifest__.py b/attachment_swift/__manifest__.py index 6ba77ef..1a63b4b 100644 --- a/attachment_swift/__manifest__.py +++ b/attachment_swift/__manifest__.py @@ -15,7 +15,7 @@ 'keystoneclient', ], }, - 'website': 'http://www.camptocamp.com', + 'website': 'https://www.camptocamp.com', 'data': [], 'installable': True, } diff --git a/attachment_swift/models/ir_attachment.py b/attachment_swift/models/ir_attachment.py index 9bc0f83..37c9e8e 100644 --- a/attachment_swift/models/ir_attachment.py +++ b/attachment_swift/models/ir_attachment.py @@ -29,14 +29,14 @@ class IrAttachment(models.Model): @api.model def _get_swift_connection(self): """ Returns a connection object for the Swift object store """ - host = os.environ.get('SWIFT_HOST') + host = os.environ.get('SWIFT_AUTH_URL') account = os.environ.get('SWIFT_ACCOUNT') password = os.environ.get('SWIFT_PASSWORD') tenant_name = os.environ.get('SWIFT_TENANT_NAME') if not (host and account and password and tenant_name): raise exceptions.UserError(_( "Problem connecting to Swift store, are the env variables " - "(SWIFT_HOST, SWIFT_ACCOUNT, SWIFT_PASSWORD, " + "(SWIFT_AUTH_URL, SWIFT_ACCOUNT, SWIFT_PASSWORD, " "SWIFT_TENANT_NAME) properly set?" )) try: diff --git a/cloud_platform/__manifest__.py b/cloud_platform/__manifest__.py index 2e43c33..c938284 100644 --- a/cloud_platform/__manifest__.py +++ b/cloud_platform/__manifest__.py @@ -17,7 +17,7 @@ 'monitoring_statsd', 'server_environment', # OCA/server-tools ], - 'website': 'http://www.camptocamp.com', + 'website': 'https://www.camptocamp.com', 'data': [], 'installable': True, } diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py index 9f9e439..99c2a8c 100644 --- a/cloud_platform/models/cloud_platform.py +++ b/cloud_platform/models/cloud_platform.py @@ -51,18 +51,11 @@ class CloudPlatform(models.AbstractModel): # This will be moved to cloud_platform_exoscale on v11 @api.model def install_exoscale(self): - params = self.env['ir.config_parameter'].sudo() - params.set_param('cloud.platform.kind', 'exoscale') - environment = config['running_env'] - configs = self._config_by_server_env(environment) - params.set_param('ir_attachment.location', configs.filestore) - self.check() - if configs.filestore == FilestoreKind.s3: - self.env['ir.attachment'].sudo().force_storage() - _logger.info('cloud platform configured for exoscale') + self.install('exoscale') @api.model def install(self, platform_kind): + assert platform_kind in ('ovh', 'exoscale') params = self.env['ir.config_parameter'].sudo() params.set_param('cloud.platform.kind', platform_kind) environment = config['running_env'] @@ -86,8 +79,8 @@ class CloudPlatform(models.AbstractModel): "automatically." ) if use_swift: - assert os.environ.get('SWIFT_HOST'), ( - "SWIFT_HOST environment variable is required when " + assert os.environ.get('SWIFT_AUTH_URL'), ( + "SWIFT_AUTH_URL environment variable is required when " "ir_attachment.location is 'swift'." ) assert os.environ.get('SWIFT_ACCOUNT'), ( diff --git a/cloud_platform_exoscale/__manifest__.py b/cloud_platform_exoscale/__manifest__.py index a74abfc..2557ee4 100644 --- a/cloud_platform_exoscale/__manifest__.py +++ b/cloud_platform_exoscale/__manifest__.py @@ -13,7 +13,7 @@ 'cloud_platform', 'attachment_s3', ], - 'website': 'http://www.camptocamp.com', + 'website': 'https://www.camptocamp.com', 'data': [], 'installable': True, } diff --git a/cloud_platform_ovh/__manifest__.py b/cloud_platform_ovh/__manifest__.py index 6ea2be1..7436ebe 100644 --- a/cloud_platform_ovh/__manifest__.py +++ b/cloud_platform_ovh/__manifest__.py @@ -13,7 +13,7 @@ 'cloud_platform', 'attachment_swift', ], - 'website': 'http://www.camptocamp.com', + 'website': 'https://www.camptocamp.com', 'data': [], 'installable': True, } diff --git a/cloud_platform_ovh/models/cloud_platform.py b/cloud_platform_ovh/models/cloud_platform.py index 8c1d96b..2036889 100644 --- a/cloud_platform_ovh/models/cloud_platform.py +++ b/cloud_platform_ovh/models/cloud_platform.py @@ -29,3 +29,7 @@ class CloudPlatform(models.AbstractModel): 'dev': PlatformConfig(filestore=FilestoreKind.db), } return configs.get(environment) or configs['dev'] + + @api.model + def install_ovh(self): + self.install('ovh')