Skip to content

Provide postgres client/SU certs in cluster tests #1571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide postgres client/SU certs in cluster tests #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...t_suites/cluster/cfy_cluster_manager_resources/config_files_templates/manager_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ rabbitmq:
cluster_members: {{ rabbitmq_cluster }}

ca_path: {{ ca_path }}
ca_key_path: {{ ca_key_path }}

postgresql_server:
cluster:
nodes: {{ postgresql_cluster }}

ca_path: {{ ca_path }}
ca_key_path: {{ ca_key_path }}
ssl_enabled: true
postgres_password: strongpostgresqlpassword

Expand All @@ -41,9 +43,12 @@ validations:
ssl_inputs:
internal_cert_path: {{ node.cert_path }}
internal_key_path: {{ node.key_path }}
postgresql_client_cert_path: {{ node.cert_path }}
postgresql_client_key_path: {{ node.key_path }}
postgresql_client_cert_path: {{ db_client_cert_path }}
postgresql_client_key_path: {{ db_client_key_path }}
postgresql_superuser_client_cert_path: {{ db_client_su_cert_path }}
postgresql_superuser_client_key_path: {{ db_client_su_key_path }}
ca_cert_path: {{ ca_path }}
ca_key_path: {{ ca_key_path }}

prometheus:
credentials:
Expand All @@ -53,6 +58,7 @@ prometheus:
cert_path: {{ node.cert_path }}
key_path: {{ node.key_path }}
ca_path: {{ ca_path }}
ca_key_path: {{ ca_key_path }}

services_to_install:
- manager_service
Expand Down
18 changes: 18 additions & 0 deletions cosmo_tester/test_suites/cluster/cfy_cluster_manager_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ def _prepare_manager_config_files(template, nodes_list, rabbitmq_cluster,
rendered_date = template.render(
node=node,
ca_path=join(REMOTE_CERTS_PATH, 'ca.pem'),
ca_key_path=join(REMOTE_CERTS_PATH, 'ca.key'),
db_client_cert_path=join(REMOTE_CERTS_PATH, 'cloudify.crt'),
db_client_key_path=join(REMOTE_CERTS_PATH, 'cloudify.key'),
db_client_su_cert_path=join(REMOTE_CERTS_PATH, 'postgres.crt'),
db_client_su_key_path=join(REMOTE_CERTS_PATH, 'postgres.key'),
license_path=REMOTE_LICENSE_PATH,
rabbitmq_cluster=rabbitmq_cluster,
postgresql_cluster=postgresql_cluster
Expand Down Expand Up @@ -341,6 +346,11 @@ def _create_certificates(local_certs_path, nodes_list, tmpdir,
ca_cert = ca_base + 'pem'
ca_key = ca_base + 'key'
generate_ca_cert(ca_cert, ca_key)
generate_ca_cert(str(local_certs_path / 'cloudify.crt'),
str(local_certs_path / 'cloudify.key'))
generate_ca_cert(str(local_certs_path / 'postgres.crt'),
str(local_certs_path / 'postgres.key'))

for i, node in enumerate(nodes_list, start=1):
node_cert = str(local_certs_path / 'node-{0}.crt'.format(i))
node_key = str(local_certs_path / 'node-{0}.key'.format(i))
Expand All @@ -362,3 +372,11 @@ def _create_certificates(local_certs_path, nodes_list, tmpdir,
node.put_remote_file(remote_key, node_key)
node.put_remote_file(join(REMOTE_CERTS_PATH, 'ca.pem'), ca_cert)
node.put_remote_file(join(REMOTE_CERTS_PATH, 'ca.key'), ca_key)
node.put_remote_file(join(REMOTE_CERTS_PATH, 'cloudify.crt'),
str(local_certs_path / 'cloudify.crt'))
node.put_remote_file(join(REMOTE_CERTS_PATH, 'cloudify.key'),
str(local_certs_path / 'cloudify.key'))
node.put_remote_file(join(REMOTE_CERTS_PATH, 'postgres.crt'),
str(local_certs_path / 'postgres.crt'))
node.put_remote_file(join(REMOTE_CERTS_PATH, 'postgres.key'),
str(local_certs_path / 'postgres.key'))