openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Fix OpenSSL installation

Browse Source 
Make SSL python script to work with python3, and add become
to install packages.
Change-Id: I854a02ab76ee7f273d8f4592a3d3dfe1d7dcdf53
This commit is contained in:
Sagi Shnaidman
2019-08-03 02:20:14 +03:00
parent 02548d8c93
commit 706b9f697c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/overcloud-ssl/library/tls_tht.py
View File

@@ -115,7 +115,7 @@ def create_anchor_file(cert_ca_pem, source_dir, dest_dir, enable_tls_overcloud,
# Optionally include the undercloud's local CA certificate # Optionally include the undercloud's local CA certificate
try: try:
undercloud_ca = "/etc/pki/ca-trust/source/anchors/cm-local-ca.pem" undercloud_ca = "/etc/pki/ca-trust/source/anchors/cm-local-ca.pem"
with open(undercloud_ca, 'ro') as undercloud_ca_file: with open(undercloud_ca, 'r') as undercloud_ca_file:
undercloud_ca_content = undercloud_ca_file.read() undercloud_ca_content = undercloud_ca_file.read()
ca_map.update({"undercloud-ca": {"content": undercloud_ca_content}}) ca_map.update({"undercloud-ca": {"content": undercloud_ca_content}})
except IOError: except IOError:

16
roles/overcloud-ssl/tasks/main.yml
View File

@@ -2,15 +2,13 @@
# tasks file for ansible-role-tripleo-ssl # tasks file for ansible-role-tripleo-ssl
- when: ssl_overcloud|bool - when: ssl_overcloud|bool
block: block:
- name: Ensure rpm requirements for ssl are installed - name: Ensure rpm requirements for ssl and heat template are installed
yum: name={{ item }} state=latest become: true
with_items: package:
- openssl name:
- openssl
- name: Ensure tripleo heat template rpm requirements for ssl are installed - openstack-tripleo-heat-templates
yum: name={{ item }} state=latest state: latest
with_items:
- openstack-tripleo-heat-templates
- name: Create overcloud-create-ssl-cert.sh - name: Create overcloud-create-ssl-cert.sh
template: template: