Fixed error in Galera SSL connection related task

(according to https://review.openstack.org/#/c/425997/)

Change-Id: I1cbee2de437284cbc241710aa4ace3d985e20574
Partial-Bug: #1667789
This commit is contained in:
Andrey 2017-03-07 16:53:43 -06:00
parent 863da4bce1
commit 15131c7649
2 changed files with 2 additions and 32 deletions

View File

@ -83,10 +83,8 @@ nova_db_max_pool_size: 120
nova_db_pool_timeout: 30 nova_db_pool_timeout: 30
# Toggle whether nova connects via an encrypted connection # Toggle whether nova connects via an encrypted connection
nova_galera_use_ssl: False nova_galera_use_ssl: False
# The path to where the database server CA certificate is stored # The path where to store the database server CA certificate
nova_galera_ssl_ca_cert: /etc/ssl/certs/galera-ca.crt nova_galera_ssl_ca_cert: /etc/ssl/certs/galera-ca.pem
# 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
## DB API ## DB API
nova_api_galera_user: nova_api nova_api_galera_user: nova_api

View File

@ -25,34 +25,6 @@
- nova-config - nova-config
- nova-post-install - 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 - name: Generate nova config
config_template: config_template:
src: "{{ item.src }}" src: "{{ item.src }}"