Merge pull request #115 from cloudify-cosmo/RD-5239-Internal-certs-replacement-bug

RD-5239 Add missing ca_key_path field to config templates

Author: glukhman

cfy_cluster_manager/config_files_templates/manager_config.yaml

@@ -19,6 +19,7 @@ rabbitmq:
   cluster_members: {{ rabbitmq_cluster }}
 
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
 
 postgresql_server:
   cluster:
@@ -27,6 +28,7 @@ postgresql_server:
   ca_path: {{ external_db_configuration.ca_path }}
   {%-else-%}
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
   ssl_enabled: true
   postgres_password: {{ creds.postgresql.postgres_password }}
   {%-endif %}
@@ -77,6 +79,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

cfy_cluster_manager/config_files_templates/postgresql_config.yaml

@@ -9,6 +9,7 @@ postgresql_server:
   cert_path: {{ node.cert_path }}
   key_path: {{ node.key_path }}
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
 
   ssl_client_verification: true
   ssl_only_connections: true
@@ -35,6 +36,7 @@ prometheus:
   cert_path: {{ node.cert_path }}
   key_path: {{ node.key_path }}
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
 
 validations:
   minimum_required_total_physical_memory_in_mb: 1024

cfy_cluster_manager/config_files_templates/rabbitmq_config.yaml

@@ -14,6 +14,7 @@ rabbitmq:
   cert_path: {{ node.cert_path }}
   key_path: {{ node.key_path }}
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
 
   nodename: {{ node.name }}
 
@@ -37,6 +38,7 @@ prometheus:
   cert_path: {{ node.cert_path }}
   key_path: {{ node.key_path }}
   ca_path: {{ ca_path }}
+  ca_key_path: {{ ca_key_path }}
 
 validations:
   minimum_required_total_physical_memory_in_mb: 1024

cfy_cluster_manager/main.py

@@ -162,6 +162,7 @@ def _prepare_postgresql_config_files(template,
         rendered_data = template.render(node=node,
                                         creds=credentials,
                                         ca_path=CA_PATH,
+                                        ca_key_path=CA_KEY_PATH,
                                         postgresql_cluster=postgresql_cluster)
         _create_config_file(node, rendered_data)
 
@@ -181,6 +182,7 @@ def _prepare_rabbitmq_config_files(template,
         rendered_data = template.render(node=node,
                                         creds=credentials,
                                         ca_path=CA_PATH,
+                                        ca_key_path=CA_KEY_PATH,
                                         join_cluster=join_cluster,
                                         rabbitmq_cluster=rabbitmq_cluster,
                                         load_balancer_ip=load_balancer_ip)

packaging/version_info

@@ -1 +1 @@
-export CLOUDIFY_CLUSTER_MANAGER_VERSION=1.1.2
+export CLOUDIFY_CLUSTER_MANAGER_VERSION=1.1.3

setup.py

@@ -28,7 +28,7 @@ def get_readme_contents():
     name='cloudify-cluster-manager',
     long_description=get_readme_contents(),
     long_description_content_type='text/markdown',
-    version='1.1.2',
+    version='1.1.3',
     author='Cloudify',
     author_email='cosmo-admin@cloudify.co',
     packages=['cfy_cluster_manager'],