diff options
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial')
3 files changed, 7 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml index 16f261ef..363e5e6d 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml @@ -11,6 +11,11 @@ - name: create osd lv and mount it on /var/local/osd script: create_osd.sh +- name: fetch osd keyring from ceph_adm + fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes + delegate_to: "{{ public_vip.ip }}" + when: compute_expansion + - name: copy osd keyring copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 index 89a70686..664af687 100755 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 @@ -1,6 +1,6 @@ {% set work_threads = (ansible_processor_vcpus + 1) // 2 %} {% if work_threads > 10 %} - set work_threads = 10 +{% set work_threads = 10 %} {% endif %} <VirtualHost {{ internal_ip }}:80> diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 index f5f9d339..55c89839 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -1,6 +1,6 @@ {% set work_threads = (ansible_processor_vcpus + 1) // 2 %} {% if work_threads > 10 %} - set work_threads = 10 +{% set work_threads = 10 %} {% endif %} <VirtualHost {{ internal_ip }}:5000> |