From b071bb22c9ba04411aa1ee5f59bce2bb3c7a4fbf Mon Sep 17 00:00:00 2001
From: weiyu <weiyu@unitedstack.com>
Date: Mon, 16 May 2016 11:38:46 +0800
Subject: [PATCH] Add a cluster_network interface when we use ceph

Because of the consideration of security and performance, ceph community
recommend the use of two separate network public networks and cluster
networks. refer:
http://docs.ceph.com/docs/master/rados/configuration/network-config-ref/

DocImpact
Closes-Bug: #1582095
Change-Id: I8cb0e14f86c859820fbbb8af8f94ac8155338e13
---
 ansible/group_vars/all.yml                    | 1 +
 ansible/roles/ceph/templates/ceph-osd.json.j2 | 2 +-
 etc/kolla/globals.yml                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index ab63645052..dde2510cbd 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -79,6 +79,7 @@ keepalived_virtual_router_id: "51"
 kolla_external_vip_interface: "{{ network_interface }}"
 api_interface: "{{ network_interface }}"
 storage_interface: "{{ network_interface }}"
+cluster_interface: "{{ network_interface }}"
 tunnel_interface: "{{ network_interface }}"
 
 # Valid options are [ openvswitch, linuxbridge ]
diff --git a/ansible/roles/ceph/templates/ceph-osd.json.j2 b/ansible/roles/ceph/templates/ceph-osd.json.j2
index d012808ce7..24ace33c05 100644
--- a/ansible/roles/ceph/templates/ceph-osd.json.j2
+++ b/ansible/roles/ceph/templates/ceph-osd.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/ceph-osd -f -d",
+    "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'] }}",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ceph.conf",
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 475bbc9e23..30c2dfdad4 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -65,6 +65,7 @@ network_interface: "eth0"
 #kolla_external_vip_interface: "{{ network_interface }}"
 #api_interface: "{{ network_interface }}"
 #storage_interface: "{{ network_interface }}"
+#cluster_interface: "{{ network_interface }}"
 #tunnel_interface: "{{ network_interface }}"
 
 # This is the raw interface given to neutron as its external network port. Even