Fix horizon with ssl
Ubuntu did not have mod_headers enabled by default Remove unused variable and adjust 'when' conditional positioning TrivialFix Change-Id: I82b8724526c24f4481a80165520d624f6a02c336
This commit is contained in:
parent
ebc1bbb081
commit
dd8e1cb2ee
@ -209,7 +209,6 @@ haproxy_user: "openstack"
|
||||
haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}"
|
||||
kolla_enable_tls_external: "no"
|
||||
kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
|
||||
kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt"
|
||||
|
||||
#################################
|
||||
# Cinder - Block Storage options
|
||||
|
@ -35,9 +35,9 @@
|
||||
- "keepalived"
|
||||
|
||||
- name: Copying over haproxy.pem
|
||||
when: kolla_enable_tls_external | bool
|
||||
copy:
|
||||
src: "{{ kolla_external_fqdn_cert }}"
|
||||
dest: "{{ node_config_directory }}/haproxy/{{ item }}"
|
||||
with_items:
|
||||
- "haproxy.pem"
|
||||
when: kolla_enable_tls_external | bool
|
||||
|
@ -26,7 +26,9 @@ RUN apt-get install -y --no-install-recommends \
|
||||
openstack-dashboard \
|
||||
apache2 \
|
||||
libapache2-mod-wsgi \
|
||||
&& apt-get clean
|
||||
&& echo > /etc/apache2/ports.conf \
|
||||
&& apt-get clean \
|
||||
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
|
||||
|
||||
RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
|
||||
&& sed -i "s|WEBROOT='/horizon/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py \
|
||||
@ -34,7 +36,6 @@ RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/opens
|
||||
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
|
||||
&& /usr/bin/python /usr/bin/manage.py collectstatic --noinput \
|
||||
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
|
||||
&& echo "" > /etc/apache2/ports.conf \
|
||||
&& rm /etc/openstack-dashboard/local_settings.py \
|
||||
&& rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
|
||||
&& ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
|
||||
@ -57,7 +58,8 @@ RUN apt-get install -y --no-install-recommends \
|
||||
apache2 \
|
||||
libapache2-mod-wsgi \
|
||||
&& echo > /etc/apache2/ports.conf \
|
||||
&& apt-get clean
|
||||
&& apt-get clean \
|
||||
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
@ -80,7 +80,6 @@ neutron_external_interface: "eth1"
|
||||
# allow clients to perform authentication. The default is TLS disabled.
|
||||
# kolla_enable_tls_external: "yes"
|
||||
# kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
|
||||
# kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt"
|
||||
|
||||
|
||||
####################
|
||||
|
Loading…
Reference in New Issue
Block a user