diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-17 19:21:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-17 19:21:57 +0000 |
| commit | 3f2a5bdadc4bdc0cc1e76b35d04c23e48ce27396 (patch) | |
| tree | f0c7009285ff75a4a91ccb21b42597d8d71c2ad2 | |
| parent | 8bf2017bb9b463e33698dc5f32b20a661c5917eb (diff) | |
| parent | b071bb22c9ba04411aa1ee5f59bce2bb3c7a4fbf (diff) | |
| download | kolla-3f2a5bdadc4bdc0cc1e76b35d04c23e48ce27396.tar.gz kolla-3f2a5bdadc4bdc0cc1e76b35d04c23e48ce27396.zip | |
Merge "Add a cluster_network interface when we use ceph"
| -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 |