openstack/kolla-ansible
Code Issues Proposed changes

Add a cluster_network interface when we use ceph

Browse Source 
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
This commit is contained in:
weiyu 2016-05-16 11:38:46 +08:00
parent 4b2233a2e7
commit b071bb22c9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -79,6 +79,7 @@ keepalived_virtual_router_id: "51"
kolla_external_vip_interface: "{{ network_interface }}" kolla_external_vip_interface: "{{ network_interface }}"
api_interface: "{{ network_interface }}" api_interface: "{{ network_interface }}"
storage_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}"
tunnel_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}"
# Valid options are [ openvswitch, linuxbridge ] # Valid options are [ openvswitch, linuxbridge ]

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

@ -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": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",

1
etc/kolla/globals.yml
View File

@ -65,6 +65,7 @@ network_interface: "eth0"
#kolla_external_vip_interface: "{{ network_interface }}" #kolla_external_vip_interface: "{{ network_interface }}"
#api_interface: "{{ network_interface }}" #api_interface: "{{ network_interface }}"
#storage_interface: "{{ network_interface }}" #storage_interface: "{{ network_interface }}"
#cluster_interface: "{{ network_interface }}"
#tunnel_interface: "{{ network_interface }}" #tunnel_interface: "{{ network_interface }}"
# This is the raw interface given to neutron as its external network port. Even # This is the raw interface given to neutron as its external network port. Even