diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 23:17:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 23:17:52 +0000 |
| commit | 32ce37cb8f22d19fe33901ccc81f0a7792e1416d (patch) | |
| tree | 5cd58698c28cdc779950096bdac4099d2ad8e799 /ansible | |
| parent | 05b82db7016502300ed321a14f0d098ee330dc64 (diff) | |
| parent | dd8e1cb2eee2d0f767985425985c445743d04189 (diff) | |
| download | kolla-32ce37cb8f22d19fe33901ccc81f0a7792e1416d.tar.gz kolla-32ce37cb8f22d19fe33901ccc81f0a7792e1416d.zip | |
Merge "Fix horizon with ssl"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/haproxy/tasks/config.yml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 4b0525b75..ff0e4d2f0 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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 diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index e41f6aa48..887af1aa5 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -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 |
