Fix Horizon SSL when AMQP SSL is not configured

https://review.openstack.org/329505 commented out a couple lines
in ssl_001.py, which effectively break SSL cert creation for Horizon
if AMQP SSL is not configured.

Change-Id: I8ef4e398f852dc3ab77fadde01777f2f136e6e37
This commit is contained in:
Javier Pena 2017-06-21 15:05:53 +02:00 committed by Alfredo Moralejo
parent 6d032f6908
commit d8b0166146
1 changed files with 2 additions and 3 deletions

View File

@ -213,9 +213,8 @@ def create_self_signed_cert(config, messages):
# for now hardcoded place for landing CACert file on servers
config['CONFIG_SSL_CACERT'] = '/etc/pki/tls/certs/packstack_cacert.crt'
# if (config['CONFIG_AMQP_ENABLE_SSL'] != 'y' and
# config["CONFIG_HORIZON_SSL"] != 'y'):
if config['CONFIG_AMQP_ENABLE_SSL'] != 'y':
if (config['CONFIG_AMQP_ENABLE_SSL'] != 'y' and
config["CONFIG_HORIZON_SSL"] != 'y'):
return
config['CONFIG_SSL_CERT_DIR'] = os.path.expanduser(