diff --git a/defaults/main.yml b/defaults/main.yml index 28b3e603..3c9fbf28 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -83,10 +83,8 @@ nova_db_max_pool_size: 120 nova_db_pool_timeout: 30 # Toggle whether nova connects via an encrypted connection nova_galera_use_ssl: False -# The path to where the database server CA certificate is stored -nova_galera_ssl_ca_cert: /etc/ssl/certs/galera-ca.crt -# The path to a user-provided Galera CA certificate file on the deployment host -#galera_user_ssl_ca_cert: /etc/openstack_deploy/files/galera-ca.crt +# The path where to store the database server CA certificate +nova_galera_ssl_ca_cert: /etc/ssl/certs/galera-ca.pem ## DB API nova_api_galera_user: nova_api diff --git a/tasks/nova_post_install.yml b/tasks/nova_post_install.yml index 7b9cec57..67773441 100644 --- a/tasks/nova_post_install.yml +++ b/tasks/nova_post_install.yml @@ -25,34 +25,6 @@ - nova-config - nova-post-install -- name: Distribute self signed Galera ssl CA cert - copy: - dest: "{{ nova_galera_ssl_ca_cert }}" - content: "{{ hostvars[galera_cluster_members[0]]['galera_ssl_ca_cert_fact'] | b64decode }}" - owner: "root" - group: "{{ item.group|default(nova_system_group_name) }}" - mode: "0640" - when: - - nova_galera_use_ssl | bool - - galera_user_ssl_ca_cert is undefined - tags: - - nova-config - - nova-post-install - -- name: Distribute user provided Galera ssl CA cert - copy: - dest: "{{ nova_galera_ssl_ca_cert }}" - src: "{{ galera_user_ssl_ca_cert }}" - owner: "root" - group: "{{ item.group|default(nova_system_group_name) }}" - mode: "0640" - when: - - nova_galera_use_ssl | bool - - galera_user_ssl_ca_cert is defined - tags: - - nova-config - - nova-post-install - - name: Generate nova config config_template: src: "{{ item.src }}"