common: move restapi template to config

Closes: github.com/ceph/ceph-ansible/issues/1981
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit ba5c6e66f03314d1b7263225e75f0f56c438db3b)
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/templates/client_restapi_address.j2 b/roles/ceph-common/templates/client_restapi_address.j2
deleted file mode 100644 (file)
index e7279a8..0000000
--- 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 (file)
index 6686de6..0000000
--- 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 (file)
index 0000000..e7279a8
--- /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 (file)
index 0000000..6686de6
--- /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 }}
+