opendev
/
system-config
Code Issues Proposed changes

OpenstackId config updates 

Added cloud storage config

Change-Id: I39cefce0c1910df0fc051817193e14e5a38c3a1e
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-09-21 17:40:19 -03:00
parent 8e1d69a674
commit 2f970563c0
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/site.pp
View File

@ -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',
}
}

14
modules/openstack_project/manifests/openstackid_dev.pp
View File

@ -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)

14
modules/openstack_project/manifests/openstackid_prod.pp
View File

@ -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)