openstack/kolla-ansible
Code Issues Proposed changes

Allow genconfig to work with kolla-kubernetes and ceph

Browse Source 
TrivialFix

Change-Id: If3b975710425a88f5cc8df016a009e5e5b413ca5
This commit is contained in:
Kevin Fox 2016-09-19 17:02:24 -07:00
parent 1863399686
commit 08146dc3b6
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/ceph/templates/ceph-mon.json.j2
View File

@ -1,5 +1,9 @@
{ {
{%- if orchestration_engine == 'KUBERNETES' %}
"command": "/usr/bin/ceph-mon -d -i @MONID@ --public-addr @MONADDR@:6789",
{%- else %}
"command": "/usr/bin/ceph-mon -d -i {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789", "command": "/usr/bin/ceph-mon -d -i {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
{%- endif %}
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",

4
ansible/roles/ceph/templates/ceph-osd.json.j2
View File

@ -1,5 +1,9 @@
{ {
{%- if orchestration_engine == 'KUBERNETES' %}
"command": "/usr/bin/ceph-osd -f -d --public-addr @HOSTADDR@ --cluster-addr @CLUSTERADDR@",
{%- else %}
"command": "/usr/bin/ceph-osd -f -d --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --cluster-addr {{ hostvars[inventory_hostname]['ansible_' + cluster_interface]['ipv4']['address'] }}", "command": "/usr/bin/ceph-osd -f -d --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --cluster-addr {{ hostvars[inventory_hostname]['ansible_' + cluster_interface]['ipv4']['address'] }}",
{%- endif %}
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",

8
ansible/roles/ceph/templates/ceph.conf.j2
View File

@ -4,11 +4,13 @@ log to syslog = true
err to syslog = true err to syslog = true
fsid = {{ ceph_cluster_fsid }} fsid = {{ ceph_cluster_fsid }}
{% if orchestration_engine != 'KUBERNETES' %}
mon initial members = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %} mon initial members = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %}
mon host = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %} mon host = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %}
mon addr = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}:6789{% if not loop.last %}, {% endif %}{% endfor %} mon addr = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}:6789{% if not loop.last %}, {% endif %}{% endfor %}
{% endif %}
auth cluster required = cephx auth cluster required = cephx
auth service required = cephx auth service required = cephx
@ -27,8 +29,10 @@ mon compact on start = true
{% if service_name is defined and service_name == 'ceph-rgw' %} {% if service_name is defined and service_name == 'ceph-rgw' %}
[client.radosgw.gateway] [client.radosgw.gateway]
{% if orchestration_engine != 'KUBERNETES' %}
host = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} host = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}
keyring = /etc/ceph/ceph.client.radosgw.keyring
log file = /var/log/kolla/ceph/client.radosgw.gateway.log
rgw frontends = civetweb port={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rgw_port }} rgw frontends = civetweb port={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rgw_port }}
{% endif %} {% endif %}
keyring = /etc/ceph/ceph.client.radosgw.keyring
log file = /var/log/kolla/ceph/client.radosgw.gateway.log
{% endif %}