From 08146dc3b67762bf526a966cd973483b5325b878 Mon Sep 17 00:00:00 2001
From: Kevin Fox <kevin@efox.cc>
Date: Mon, 19 Sep 2016 17:02:24 -0700
Subject: [PATCH] Allow genconfig to work with kolla-kubernetes and ceph

TrivialFix

Change-Id: If3b975710425a88f5cc8df016a009e5e5b413ca5
---
 ansible/roles/ceph/templates/ceph-mon.json.j2 | 4 ++++
 ansible/roles/ceph/templates/ceph-osd.json.j2 | 4 ++++
 ansible/roles/ceph/templates/ceph.conf.j2     | 8 ++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/ceph/templates/ceph-mon.json.j2 b/ansible/roles/ceph/templates/ceph-mon.json.j2
index d3a32b3999..c1cc964547 100644
--- a/ansible/roles/ceph/templates/ceph-mon.json.j2
+++ b/ansible/roles/ceph/templates/ceph-mon.json.j2
@@ -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",
+{%- endif %}
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ceph.conf",
diff --git a/ansible/roles/ceph/templates/ceph-osd.json.j2 b/ansible/roles/ceph/templates/ceph-osd.json.j2
index 24ace33c05..f6d62e8923 100644
--- a/ansible/roles/ceph/templates/ceph-osd.json.j2
+++ b/ansible/roles/ceph/templates/ceph-osd.json.j2
@@ -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'] }}",
+{%- endif %}
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ceph.conf",
diff --git a/ansible/roles/ceph/templates/ceph.conf.j2 b/ansible/roles/ceph/templates/ceph.conf.j2
index 261c594cd0..2d69c8d6de 100644
--- a/ansible/roles/ceph/templates/ceph.conf.j2
+++ b/ansible/roles/ceph/templates/ceph.conf.j2
@@ -4,11 +4,13 @@ log to syslog = true
 err to syslog = true
 
 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 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 %}
+{% endif %}
 
 auth cluster 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' %}
 [client.radosgw.gateway]
+{% if orchestration_engine != 'KUBERNETES' %}
 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 }}
 {% endif %}
+keyring = /etc/ceph/ceph.client.radosgw.keyring
+log file = /var/log/kolla/ceph/client.radosgw.gateway.log
+{% endif %}