diff --git a/manifests/site.pp b/manifests/site.pp index dad231edee..2e65907938 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -454,6 +454,13 @@ node /^openstackid\d*(\.openstack)?\.org$/ { message_broker_ssl_client_cert_file_contents => hiera('openstackid_message_broker_ssl_client_cert_file_contents'), message_broker_ssl_client_key_file_contents => hiera('openstackid_message_broker_ssl_client_key_file_contents'), message_broker_enabled => true, + cloud_storage_base_url => hiera('openstackid_cloud_storage_base_url'), + cloud_storage_auth_url => 'https://auth.vexxhost.net/v3', + cloud_storage_app_credential_id => hiera('openstackid_cloud_storage_app_credential_id'), + cloud_storage_app_credential_secret => hiera('openstackid_cloud_storage_app_credential_secret'), + cloud_storage_project_name => hiera('openstackid_cloud_storage_project_name'), + cloud_storage_region => 'ca-ymq-1', + cloud_storage_container => 'idp-osf', } } @@ -498,6 +505,13 @@ node /^openstackid-dev\d*\.openstack\.org$/ { message_broker_ssl_client_cert_file_contents => hiera('openstackid_dev_message_broker_ssl_client_cert_file_contents'), message_broker_ssl_client_key_file_contents => hiera('openstackid_dev_message_broker_ssl_client_key_file_contents'), message_broker_enabled => true, + cloud_storage_base_url => hiera('openstackid_dev_cloud_storage_base_url'), + cloud_storage_auth_url => 'https://auth.vexxhost.net/v3', + cloud_storage_app_credential_id => hiera('openstackid_dev_cloud_storage_app_credential_id'), + cloud_storage_app_credential_secret => hiera('openstackid_dev_cloud_storage_app_credential_secret'), + cloud_storage_project_name => hiera('openstackid_dev_cloud_storage_project_name'), + cloud_storage_region => 'ca-ymq-1', + cloud_storage_container => 'idp-osf', } } diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 3c798ab94b..1d1fe4879a 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -83,6 +83,13 @@ class openstack_project::openstackid_dev ( $message_broker_ssl_client_key_file = '/etc/rabbitmq-client-ssl/client-key.pem', $message_broker_ssl_client_key_file_contents = '', $message_broker_enabled = false, + $cloud_storage_base_url = '', + $cloud_storage_auth_url = '', + $cloud_storage_app_credential_id = '', + $cloud_storage_app_credential_secret = '', + $cloud_storage_project_name = '', + $cloud_storage_region = '', + $cloud_storage_container = '', ) { class { 'openstack_project::server': } @@ -157,6 +164,13 @@ class openstack_project::openstackid_dev ( message_broker_ssl_client_key_file => $message_broker_ssl_client_key_file, message_broker_ssl_client_key_file_contents => $message_broker_ssl_client_key_file_contents, message_broker_enabled => $message_broker_enabled, + cloud_storage_base_url => $cloud_storage_base_url, + cloud_storage_auth_url => $cloud_storage_auth_url, + cloud_storage_app_credential_id => $cloud_storage_app_credential_id, + cloud_storage_app_credential_secret => $cloud_storage_app_credential_secret, + cloud_storage_project_name => $cloud_storage_project_name, + cloud_storage_region => $cloud_storage_region, + cloud_storage_container => $cloud_storage_container, } # redis (custom module written by tipit) diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index 43b4eb255a..8a68c31cb4 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -84,6 +84,13 @@ class openstack_project::openstackid_prod ( $message_broker_ssl_client_key_file = '/etc/rabbitmq-client-ssl/client-key.pem', $message_broker_ssl_client_key_file_contents = '', $message_broker_enabled = false, + $cloud_storage_base_url = '', + $cloud_storage_auth_url = '', + $cloud_storage_app_credential_id = '', + $cloud_storage_app_credential_secret = '', + $cloud_storage_project_name = '', + $cloud_storage_region = '', + $cloud_storage_container = '', ) { class { 'openstack_project::server': } @@ -160,6 +167,13 @@ class openstack_project::openstackid_prod ( message_broker_ssl_client_key_file => $message_broker_ssl_client_key_file, message_broker_ssl_client_key_file_contents => $message_broker_ssl_client_key_file_contents, message_broker_enabled => $message_broker_enabled, + cloud_storage_base_url => $cloud_storage_base_url, + cloud_storage_auth_url => $cloud_storage_auth_url, + cloud_storage_app_credential_id => $cloud_storage_app_credential_id, + cloud_storage_app_credential_secret => $cloud_storage_app_credential_secret, + cloud_storage_project_name => $cloud_storage_project_name, + cloud_storage_region => $cloud_storage_region, + cloud_storage_container => $cloud_storage_container, } # redis (custom module written by tipit)