openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Merge "An OSA password needs to end with _password"

Browse Source
This commit is contained in:
Zuul 2018-06-01 01:13:20 +00:00 committed by Gerrit Code Review
commit f050a982f7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -407,7 +407,7 @@ octavia_client_cert: "{{ octavia_cert_dir }}/client.pem"
octavia_server_ca: "{{ octavia_ca_certificate }}" octavia_server_ca: "{{ octavia_ca_certificate }}"
# ca certs # ca certs
octavia_ca_private_key: "{{ octavia_cert_dir }}/private/cakey.pem" octavia_ca_private_key: "{{ octavia_cert_dir }}/private/cakey.pem"
octavia_ca_private_key_passphrase: "{{ octavia_cert_password_client }}" octavia_ca_private_key_passphrase: "{{ octavia_cert_client_password }}"
octavia_ca_certificate: "{{ octavia_cert_dir }}/ca_server_01.pem" octavia_ca_certificate: "{{ octavia_cert_dir }}/ca_server_01.pem"
octavia_signing_digest: sha256 octavia_signing_digest: sha256

6
tasks/octavia_certs_install.yml
View File

@ -47,7 +47,7 @@
- name: Create the client CAs private key - name: Create the client CAs private key
openssl_privatekey: openssl_privatekey:
path: "{{ octavia_client_ca_key }}" path: "{{ octavia_client_ca_key }}"
passphrase: "{{ octavia_cert_password_client }}" passphrase: "{{ octavia_cert_client_password }}"
cipher: "{{ octavia_cert_cipher_client }}" cipher: "{{ octavia_cert_cipher_client }}"
size: "{{ octavia_cert_key_length_client }}" size: "{{ octavia_cert_key_length_client }}"
@ -56,13 +56,13 @@
path: "{{ octavia_cert_dir }}/ca_01.csr" path: "{{ octavia_cert_dir }}/ca_01.csr"
common_name: "{{ octavia_cert_client_ca_common_name }}" common_name: "{{ octavia_cert_client_ca_common_name }}"
privatekey_path: "{{ octavia_client_ca_key }}" privatekey_path: "{{ octavia_client_ca_key }}"
privatekey_passphrase: "{{ octavia_cert_password_client }}" privatekey_passphrase: "{{ octavia_cert_client_password }}"
- name: Create client CA certificate - name: Create client CA certificate
openssl_certificate: openssl_certificate:
path: "{{ octavia_client_ca }}" path: "{{ octavia_client_ca }}"
privatekey_path: "{{ octavia_client_ca_key }}" privatekey_path: "{{ octavia_client_ca_key }}"
privatekey_passphrase: "{{ octavia_cert_password_client }}" privatekey_passphrase: "{{ octavia_cert_client_password }}"
csr_path: "{{ octavia_cert_dir }}/ca_01.csr" csr_path: "{{ octavia_cert_dir }}/ca_01.csr"
provider: selfsigned provider: selfsigned
owner: "{{ lookup('env', 'USER') }}" owner: "{{ lookup('env', 'USER') }}"

2
tests/os_octavia-overrides.yml
View File

@ -100,5 +100,5 @@ octavia_compute_driver: "{% if test_octavia_amphora | bool %}compute_nova_driver
octavia_network_driver: "{% if test_octavia_amphora | bool %}allowed_address_pairs_driver{% else %}network_noop_driver{% endif %}" octavia_network_driver: "{% if test_octavia_amphora | bool %}allowed_address_pairs_driver{% else %}network_noop_driver{% endif %}"
# cert generation # cert generation
octavia_cert_password_client: 'changeme' octavia_cert_client_password: 'changeme'