Merge "Add a cluster_network interface when we use ceph"

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 ]

ansible/roles/ceph/templates/ceph-osd.json.j2

 {
-    "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",

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