diff options
| author | weiyu <weiyu@unitedstack.com> | 2016-05-16 11:38:46 +0800 |
|---|---|---|
| committer | weiyu <weiyu@unitedstack.com> | 2016-05-17 14:09:36 +0800 |
| commit | b071bb22c9ba04411aa1ee5f59bce2bb3c7a4fbf (patch) | |
| tree | 34eafc73071a54dae0278917ac9cda26d0cf2b0a | |
| parent | 4b2233a2e7d4abded1dba1d893f1d137cc459342 (diff) | |
| download | kolla-b071bb22c9ba04411aa1ee5f59bce2bb3c7a4fbf.tar.gz kolla-b071bb22c9ba04411aa1ee5f59bce2bb3c7a4fbf.zip | |
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
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/ceph/templates/ceph-osd.json.j2 | 2 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index ab6364505..dde2510cb 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 d012808ce..24ace33c0 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 475bbc9e2..30c2dfdad 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 |