openstack/kolla
Code Issues Proposed changes

Merge "Add a cluster_network interface when we use ceph"

Browse Source
This commit is contained in:
Jenkins 2016-05-17 19:21:57 +00:00 committed by Gerrit Code Review
commit 3f2a5bdadc
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 }}"
api_interface: "{{ network_interface }}"
storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}"
tunnel_interface: "{{ network_interface }}"
# 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": [
{
"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 }}"
#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