Skip to content

Commit

Permalink
Haproxy fails to start as the keystone certs are not created before
Browse files Browse the repository at this point in the history
starting haproxy in a HA setup. Fix is to create keystone ssl
certificates before configuring haproxy and skip recreating
certs during openstack setup.

Change-Id: Ibb53ad16c0222ebd3685a03c09398a1067464664
Closes-Bug: 1649787
  • Loading branch information
cijohnson committed Dec 14, 2016
1 parent 95a8014 commit b27b0fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions fabfile/tasks/ha.py
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ def setup_ha():
execute('fix_wsrep_cluster_address')
execute('setup_cmon_schema')
execute('fix_restart_xinetd_conf')
if keystone_ssl_enabled():
execute("setup_keystone_ssl_certs")
execute('fixup_restart_haproxy_in_openstack')
execute('setup_glance_images_loc')
execute('fix_memcache_conf')
Expand Down
3 changes: 2 additions & 1 deletion fabfile/tasks/provision.py
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,8 @@ def setup_openstack_node(*args):
cmd = frame_vnc_openstack_cmd(host_string)
# Execute the provision openstack script
with settings(host_string=host_string):
if keystone_ssl_enabled():
# Certs are already created in setup_ha task
if keystone_ssl_enabled() and not get_openstack_internal_vip():
execute("setup_keystone_ssl_certs_node", host_string)
with cd(INSTALLER_DIR):
sudo(cmd)
Expand Down

0 comments on commit b27b0fa

Please sign in to comment.