From: Sébastien Han Date: Fri, 20 Oct 2017 09:14:13 +0000 (+0200) Subject: common: move restapi template to config X-Git-Tag: v3.0.16~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b4e65acbb23befaaa1be99b25cc2f76a27fe0e;p=ceph-ansible.git common: move restapi template to config Closes: github.com/ceph/ceph-ansible/issues/1981 Signed-off-by: Sébastien Han (cherry picked from commit ba5c6e66f03314d1b7263225e75f0f56c438db3b) Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-common/templates/client_restapi_address.j2 b/roles/ceph-common/templates/client_restapi_address.j2 deleted file mode 100644 index e7279a861..000000000 --- a/roles/ceph-common/templates/client_restapi_address.j2 +++ /dev/null @@ -1,2 +0,0 @@ -public addr = {{ hostvars[inventory_hostname]['restapi_address'] if hostvars[inventory_hostname]['restapi_address'] is defined else restapi_address }}:{{ restapi_port }} - diff --git a/roles/ceph-common/templates/client_restapi_interface.j2 b/roles/ceph-common/templates/client_restapi_interface.j2 deleted file mode 100644 index 6686de60e..000000000 --- a/roles/ceph-common/templates/client_restapi_interface.j2 +++ /dev/null @@ -1,2 +0,0 @@ -public addr = {{ hostvars[inventory_hostname]['ansible_' + restapi_interface]['ipv4']['address'] }}:{{ restapi_port }} - diff --git a/roles/ceph-config/templates/client_restapi_address.j2 b/roles/ceph-config/templates/client_restapi_address.j2 new file mode 100644 index 000000000..e7279a861 --- /dev/null +++ b/roles/ceph-config/templates/client_restapi_address.j2 @@ -0,0 +1,2 @@ +public addr = {{ hostvars[inventory_hostname]['restapi_address'] if hostvars[inventory_hostname]['restapi_address'] is defined else restapi_address }}:{{ restapi_port }} + diff --git a/roles/ceph-config/templates/client_restapi_interface.j2 b/roles/ceph-config/templates/client_restapi_interface.j2 new file mode 100644 index 000000000..6686de60e --- /dev/null +++ b/roles/ceph-config/templates/client_restapi_interface.j2 @@ -0,0 +1,2 @@ +public addr = {{ hostvars[inventory_hostname]['ansible_' + restapi_interface]['ipv4']['address'] }}:{{ restapi_port }} +