4 files changed, 0 insertions, 125 deletions
diff --git a/ansible/roles/ceph/templates/ceph-mon.json.j2 b/ansible/roles/ceph/templates/ceph-mon.json.j2
deleted file mode 100644
index c1cc96454..000000000
--- a/ansible/roles/ceph/templates/ceph-mon.json.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-{%- if orchestration_engine == 'KUBERNETES' %}
-    "command": "/usr/bin/ceph-mon -d -i @MONID@ --public-addr @MONADDR@:6789",
-{%- else %}
-    "command": "/usr/bin/ceph-mon -d -i {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
-{%- endif %}
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceph.conf",
-            "dest": "/etc/ceph/ceph.conf",
-            "owner": "ceph",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
-            "dest": "/etc/ceph/ceph.client.admin.keyring",
-            "owner": "ceph",
-            "perm": "0600",
-            "optional": true
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.mon.keyring",
-            "dest": "/etc/ceph/ceph.client.mon.keyring",
-            "owner": "ceph",
-            "perm": "0600",
-            "optional": true
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring",
-            "dest": "/etc/ceph/ceph.client.radosgw.keyring",
-            "owner": "ceph",
-            "perm": "0600",
-            "optional": true
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.monmap",
-            "dest": "/etc/ceph/ceph.monmap",
-            "owner": "ceph",
-            "perm": "0600",
-            "optional": true
-        }
-    ]
-}
diff --git a/ansible/roles/ceph/templates/ceph-osd.json.j2 b/ansible/roles/ceph/templates/ceph-osd.json.j2
deleted file mode 100644
index f6d62e892..000000000
--- a/ansible/roles/ceph/templates/ceph-osd.json.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-{%- if orchestration_engine == 'KUBERNETES' %}
-    "command": "/usr/bin/ceph-osd -f -d --public-addr @HOSTADDR@ --cluster-addr @CLUSTERADDR@",
-{%- else %}
-    "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'] }}",
-{%- endif %}
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceph.conf",
-            "dest": "/etc/ceph/ceph.conf",
-            "owner": "ceph",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
-            "dest": "/etc/ceph/ceph.client.admin.keyring",
-            "owner": "ceph",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceph/templates/ceph-rgw.json.j2 b/ansible/roles/ceph/templates/ceph-rgw.json.j2
deleted file mode 100644
index 7cb0ccdd4..000000000
--- a/ansible/roles/ceph/templates/ceph-rgw.json.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "command": "/usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway -d",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceph.conf",
-            "dest": "/etc/ceph/ceph.conf",
-            "owner": "ceph",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
-            "dest": "/etc/ceph/ceph.client.admin.keyring",
-            "owner": "ceph",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring",
-            "dest": "/etc/ceph/ceph.client.radosgw.keyring",
-            "owner": "ceph",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceph/templates/ceph.conf.j2 b/ansible/roles/ceph/templates/ceph.conf.j2
deleted file mode 100644
index 2d69c8d6d..000000000
--- a/ansible/roles/ceph/templates/ceph.conf.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-[global]
-log file = /var/log/kolla/ceph/$cluster-$name.log
-log to syslog = true
-err to syslog = true
-
-fsid = {{ ceph_cluster_fsid }}
-{% if orchestration_engine != 'KUBERNETES' %}
-mon initial members = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %}
-
-mon host = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}{% if not loop.last %}, {% endif %}{% endfor %}
-
-mon addr = {% for host in groups['ceph-mon'] %}{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}:6789{% if not loop.last %}, {% endif %}{% endfor %}
-{% endif %}
-
-auth cluster required = cephx
-auth service required = cephx
-auth client required = cephx
-
-# NOTE(inc0): This line will mean that if ceph was upgraded, it will run as root
-#             until contents of /var/lib/ceph are chowned to ceph user.
-#             This change was introduced in Jewel version and we should include
-#             chown operation in upgrade procedure. https://bugs.launchpad.net/kolla/+bug/1620702
-setuser match path = /var/lib/ceph/$type/$cluster-$id
-
-[mon]
-# NOTE(SamYaple): The monitor files have been known to grow very large. The
-#                 only fix for that is to compact the files.
-mon compact on start = true
-
-{% if service_name is defined and service_name == 'ceph-rgw' %}
-[client.radosgw.gateway]
-{% if orchestration_engine != 'KUBERNETES' %}
-host = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}
-rgw frontends = civetweb port={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rgw_port }}
-{% endif %}
-keyring = /etc/ceph/ceph.client.radosgw.keyring
-log file = /var/log/kolla/ceph/client.radosgw.gateway.log
-{% endif %}