Merge "Remove Swift role"

68 files changed, 12 insertions, 2533 deletions

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index c5fbc54bc..7452ef953 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -286,8 +286,6 @@ network_interface: "eth0"
 neutron_external_interface: "eth1"
 kolla_external_vip_interface: "{{ network_interface }}"
 api_interface: "{{ network_interface }}"
-swift_storage_interface: "{{ network_interface }}"
-swift_replication_interface: "{{ swift_storage_interface }}"
 migration_interface: "{{ api_interface }}"
 tunnel_interface: "{{ network_interface }}"
 octavia_network_interface: "{{ 'o-hm0' if octavia_network_type == 'tenant' else api_interface }}"
@@ -302,8 +300,6 @@ ironic_tftp_interface: "{{ api_interface }}"
 network_address_family: "ipv4"
 api_address_family: "{{ network_address_family }}"
 storage_address_family: "{{ network_address_family }}"
-swift_storage_address_family: "{{ storage_address_family }}"
-swift_replication_address_family: "{{ swift_storage_address_family }}"
 migration_address_family: "{{ api_address_family }}"
 tunnel_address_family: "{{ network_address_family }}"
 octavia_network_address_family: "{{ api_address_family }}"
@@ -711,17 +707,6 @@ skyline_console_listen_port: "{{ skyline_console_port }}"
 skyline_console_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else skyline_console_port }}"
 skyline_enable_sso: "{{ enable_keystone_federation | bool and keystone_identity_providers | selectattr('protocol', 'equalto', 'openid') | list | count > 0 }}"
 
-swift_internal_fqdn: "{{ kolla_internal_fqdn }}"
-swift_external_fqdn: "{{ kolla_external_fqdn }}"
-swift_internal_base_endpoint: "{{ swift_internal_fqdn | kolla_url(internal_protocol, swift_proxy_server_port) }}"
-swift_public_base_endpoint: "{{ swift_external_fqdn | kolla_url(public_protocol, swift_proxy_server_port) }}"
-swift_proxy_server_port: "8080"
-swift_proxy_server_listen_port: "{{ swift_proxy_server_port }}"
-swift_object_server_port: "6000"
-swift_account_server_port: "6001"
-swift_container_server_port: "6002"
-swift_rsync_port: "10873"
-
 syslog_udp_port: "{{ fluentd_syslog_port }}"
 
 tacker_internal_fqdn: "{{ kolla_internal_fqdn }}"
@@ -947,9 +932,6 @@ enable_prometheus: "no"
 enable_proxysql: "yes"
 enable_redis: "no"
 enable_skyline: "no"
-enable_swift: "no"
-enable_swift_s3api: "no"
-enable_swift_recon: "no"
 enable_tacker: "no"
 enable_telegraf: "no"
 enable_trove: "no"
@@ -1106,12 +1088,11 @@ openstack_auth:
 #######################
 # Glance options
 #######################
-glance_backend_file: "{{ not (glance_backend_ceph | bool or glance_backend_s3 | bool or glance_backend_swift | bool or glance_backend_vmware | bool) }}"
+glance_backend_file: "{{ not (glance_backend_ceph | bool or glance_backend_s3 | bool or glance_backend_vmware | bool) }}"
 glance_backend_ceph: "no"
 glance_backend_vmware: "no"
 glance_backend_s3: "no"
 enable_glance_image_cache: "no"
-glance_backend_swift: "{{ enable_swift | bool }}"
 glance_file_datadir_volume: "glance"
 glance_enable_rolling_upgrade: "no"
 glance_enable_property_protection: "no"
@@ -1130,8 +1111,8 @@ barbican_library_path: "/usr/lib/libCryptoki2_64.so"
 #################
 # Gnocchi options
 #################
-# Valid options are [ file, ceph, swift ]
-gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}"
+# Valid options are [ file, ceph ]
+gnocchi_backend_storage: "file"
 
 # Valid options are [redis, '']
 gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
@@ -1150,7 +1131,7 @@ cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else '
 # Valid options are [ '', redis, etcd ]
 cinder_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"
 
-# Valid options are [ nfs, swift, ceph, s3 ]
+# Valid options are [ nfs, ceph, s3 ]
 cinder_backup_driver: "ceph"
 cinder_backup_share: ""
 cinder_backup_mount_options_nfs: ""
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 34319bb84..51ee06b80 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -94,9 +94,6 @@ control
 [horizon:children]
 control
 
-[swift:children]
-control
-
 [barbican:children]
 control
 
@@ -306,19 +303,6 @@ network
 [manila-data:children]
 manila
 
-# Swift
-[swift-proxy-server:children]
-swift
-
-[swift-account-server:children]
-storage
-
-[swift-container-server:children]
-storage
-
-[swift-object-server:children]
-storage
-
 # Barbican
 [barbican-api:children]
 barbican
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 28cc56e88..385915092 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -118,9 +118,6 @@ control
 [horizon:children]
 control
 
-[swift:children]
-control
-
 [barbican:children]
 control
 
@@ -325,19 +322,6 @@ network
 [manila-data:children]
 manila
 
-# Swift
-[swift-proxy-server:children]
-swift
-
-[swift-account-server:children]
-storage
-
-[swift-container-server:children]
-storage
-
-[swift-object-server:children]
-storage
-
 # Barbican
 [barbican-api:children]
 barbican
diff --git a/ansible/library/kolla_container_facts.py b/ansible/library/kolla_container_facts.py
index 18c194c9f..79316dbce 100644
--- a/ansible/library/kolla_container_facts.py
+++ b/ansible/library/kolla_container_facts.py
@@ -140,8 +140,8 @@ class ContainerFactsWorker():
 
     def get_containers_state(self):
         """Handle when module is called with action get_containers_state"""
-        # NOTE(r-krcek): This function can be removed when bifrost and swift
-        # roles switch to modern format
+        # NOTE(r-krcek): This function can be removed when bifrost
+        # role switches to modern format
         names = self.params.get('name')
         self.result['states'] = dict()
 
@@ -152,8 +152,8 @@ class ContainerFactsWorker():
 
     def get_containers_env(self):
         """Handle when module is called with action get_containers_state"""
-        # NOTE(r-krcek): This function can be removed when bifrost and swift
-        # roles switch to modern format
+        # NOTE(r-krcek): This function can be removed when bifrost
+        # role switches to modern format
         names = self.params.get('name')
         self.result['envs'] = dict()
 
diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml
index d4f0961b8..0fbf1129f 100644
--- a/ansible/roles/ceilometer/tasks/register.yml
+++ b/ansible/roles/ceilometer/tasks/register.yml
@@ -4,19 +4,3 @@
   vars:
     service_ks_register_auth: "{{ openstack_ceilometer_auth }}"
     service_ks_register_users: "{{ ceilometer_ks_users }}"
-
-- name: Associate the ResellerAdmin role and ceilometer user
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: openstack.cloud.role_assignment
-    module_args:
-      project: "service"
-      user: "{{ ceilometer_keystone_user }}"
-      role: "ResellerAdmin"
-      region_name: "{{ openstack_region_name }}"
-      auth: "{{ openstack_ceilometer_auth }}"
-      endpoint_type: "{{ openstack_interface }}"
-      cacert: "{{ openstack_cacert }}"
-  when: enable_swift | bool
-  run_once: True
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 372527b23..55e137cb2 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -46,14 +46,6 @@ backup_mount_options = {{ cinder_backup_mount_options_nfs }}
 backup_mount_point_base = /var/lib/cinder/backup
 backup_share = {{ cinder_backup_share }}
 backup_file_size = 327680000
-{% elif enable_swift | bool and cinder_backup_driver == "swift" %}
-backup_driver = cinder.backup.drivers.swift.SwiftBackupDriver
-backup_swift_url = {{ swift_internal_base_endpoint }}/v1/AUTH_
-backup_swift_ca_cert_file = {{ openstack_cacert }}
-backup_swift_auth = per_user
-backup_swift_auth_version = 1
-backup_swift_user =
-backup_swift_key =
 {% elif cinder_backup_driver == "s3" %}
 backup_driver = cinder.backup.drivers.s3.S3BackupDriver
 backup_s3_endpoint_url = {{ cinder_backup_s3_url }}
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index 7356c53dc..830e5c3ad 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -74,19 +74,11 @@ fluentd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_
 fluentd_tag: "{{ common_tag }}"
 fluentd_image_full: "{{ fluentd_image }}:{{ fluentd_tag }}"
 
-syslog_swift_facility: "local0"
 syslog_haproxy_facility: "local1"
 syslog_glance_tls_proxy_facility: "local2"
 syslog_neutron_tls_proxy_facility: "local4"
 
 syslog_facilities:
-  - name: "swift"
-    enabled: "{{ enable_swift | bool and (inventory_hostname in groups['swift-proxy-server'] or inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server']) }}"
-    facility: "{{ syslog_swift_facility }}"
-    logdir: "swift"
-    logfile: "swift_latest"
-    output_tag: true
-    output_time: true
   - name: "haproxy"
     enabled: "{{ enable_haproxy | bool and inventory_hostname in groups['loadbalancer'] }}"
     facility: "{{ syslog_haproxy_facility }}"
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index b24bfc36d..2754504c2 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -199,7 +199,6 @@
       - { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
       - { name: "redis", enabled: "{{ enable_redis | bool }}" }
       - { name: "skyline", enabled: "{{ enable_skyline | bool }}" }
-      - { name: "swift", enabled: "{{ enable_swift | bool }}" }
       - { name: "tacker", enabled: "{{ enable_tacker | bool }}" }
       - { name: "trove", enabled: "{{ enable_trove | bool }}" }
       - { name: "venus", enabled: "{{ enable_venus | bool }}" }
diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml
index d230a983a..96389564f 100644
--- a/ansible/roles/destroy/tasks/cleanup_host.yml
+++ b/ansible/roles/destroy/tasks/cleanup_host.yml
@@ -4,7 +4,6 @@
   script: ../tools/cleanup-host
   environment:
     enable_haproxy: "{{ enable_haproxy }}"
-    enable_swift: "{{ enable_swift }}"
     glance_file_datadir_volume: "{{ glance_file_datadir_volume }}"
     nova_instance_datadir_volume: "{{ nova_instance_datadir_volume }}"
     gnocchi_metric_datadir_volume: "{{ gnocchi_metric_datadir_volume }}"
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index 56d6b49da..02a0d01a2 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -237,9 +237,6 @@ glance_backends:
   - name: cinder
     type: cinder
     enabled: "{{ enable_cinder | bool }}"
-  - name: swift
-    type: swift
-    enabled: "{{ glance_backend_swift | bool }}"
 
 glance_ceph_backends:
   - name: "rbd"
@@ -250,7 +247,7 @@ glance_ceph_backends:
     enabled: "{{ glance_backend_ceph | bool }}"
 
 glance_store_backends: "{{ glance_backends | selectattr('enabled', 'equalto', true) | list + glance_ceph_backends | selectattr('enabled', 'equalto', true) | list }}"
-glance_default_backend: "{% if glance_backend_vmware | bool %}vmware{% elif glance_backend_ceph | bool %}{{ glance_ceph_backends[0].name }}{% elif glance_backend_swift | bool %}swift{% elif glance_backend_s3 | bool %}s3{% else %}file{% endif %}"
+glance_default_backend: "{% if glance_backend_vmware | bool %}vmware{% elif glance_backend_ceph | bool %}{{ glance_ceph_backends[0].name }}{% elif glance_backend_s3 | bool %}s3{% else %}file{% endif %}"
 
 ####################
 # OpenStack
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index 70983f82b..3e53288a5 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -87,22 +87,6 @@
     - service | service_enabled_and_mapped_to_host
     - enable_glance_image_cache | bool
 
-- name: Copying over glance-swift.conf for glance_api
-  vars:
-    service: "{{ glance_services['glance-api'] }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/glance-swift.conf.j2"
-      - "{{ node_custom_config }}/glance-swift.conf"
-      - "{{ node_custom_config }}/glance/glance-swift.conf"
-      - "{{ node_custom_config }}/glance/{{ inventory_hostname }}/glance-swift.conf"
-    dest: "{{ node_config_directory }}/glance-api/glance-swift.conf"
-    mode: "0660"
-  become: true
-  when:
-    - service | service_enabled_and_mapped_to_host
-    - glance_backend_swift | bool
-
 - name: Copying over glance-image-import.conf
   vars:
     service: "{{ glance_services['glance-api'] }}"
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 6bdc35e36..dcbcd6972 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -74,18 +74,6 @@ rbd_store_ceph_conf = /etc/ceph/{{ backend.cluster }}.conf
 {% endfor %}
 {% endif %}
 
-{% if glance_backend_swift | bool %}
-[swift]
-swift_store_container = glance
-swift_store_multiple_containers_seed = 0
-swift_store_multi_tenant = false
-swift_store_create_container_on_put = true
-swift_store_region = {{ openstack_region_name }}
-default_swift_reference = swift
-swift_store_config_file = /etc/glance/glance-swift.conf
-swift_store_auth_insecure = true
-{% endif %}
-
 {% if glance_backend_s3 | bool %}
 [s3]
 s3_store_host = {{ glance_backend_s3_url }}
diff --git a/ansible/roles/glance/templates/glance-api.json.j2 b/ansible/roles/glance/templates/glance-api.json.j2
index 486d4d668..60042e9a0 100644
--- a/ansible/roles/glance/templates/glance-api.json.j2
+++ b/ansible/roles/glance/templates/glance-api.json.j2
@@ -18,12 +18,6 @@
             "dest": "/etc/ceph",
             "owner": "glance",
             "perm": "0600"
-        }{% endif %}{% if glance_backend_swift | bool %},
-        {
-            "source": "{{ container_config_directory }}/glance-swift.conf",
-            "dest": "/etc/glance/glance-swift.conf",
-            "owner": "glance",
-            "perm": "0600"
         }{% endif %}{% if enable_glance_image_cache | bool %},
         {
             "source": "{{ container_config_directory }}/glance-cache.conf",
diff --git a/ansible/roles/glance/templates/glance-swift.conf.j2 b/ansible/roles/glance/templates/glance-swift.conf.j2
deleted file mode 100644
index 22054e5c2..000000000
--- a/ansible/roles/glance/templates/glance-swift.conf.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-[swift]
-auth_version = 3
-auth_address = {{ openstack_auth.auth_url }}
-user = service:{{ glance_keystone_user }}
-key = {{ glance_keystone_password }}
-project_domain_id = default
-user_domain_id = default
-cafile = {{ openstack_cacert }}
diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml
index 90bb021fb..af469e803 100644
--- a/ansible/roles/gnocchi/defaults/main.yml
+++ b/ansible/roles/gnocchi/defaults/main.yml
@@ -51,13 +51,6 @@ gnocchi_config_validation:
     config: "/etc/gnocchi/gnocchi.conf"
 
 ####################
-# Swift
-####################
-swift_keystone_user: "swift"
-swift_admin_tenant_name: "admin"
-
-
-####################
 # Database
 ####################
 gnocchi_database_name: "gnocchi"
diff --git a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/gnocchi.conf.j2
index aaf33c579..3f6158dba 100644
--- a/ansible/roles/gnocchi/templates/gnocchi.conf.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi.conf.j2
@@ -70,9 +70,6 @@ policy_file = {{ gnocchi_policy_file }}
 driver = redis
 redis_url = {{ redis_connection_string }}
 {% endif %}
-{% if gnocchi_backend_storage == 'swift' %}
-swift_cacert = {{ openstack_cacert }}
-{% endif %}
 
 [storage]
 {% if gnocchi_backend_storage == 'file' %}
@@ -84,14 +81,6 @@ ceph_pool = {{ ceph_gnocchi_pool_name }}
 ceph_username = {{ ceph_gnocchi_user }}
 ceph_keyring = /etc/ceph/{{ ceph_cluster }}.client.{{ ceph_gnocchi_user }}.keyring
 ceph_conffile = /etc/ceph/{{ ceph_cluster }}.conf
-{% elif gnocchi_backend_storage == 'swift' %}
-driver = swift
-swift_authurl = {{ keystone_internal_url }}
-swift_cacert = {{ openstack_cacert }}
-swift_auth_version = 3
-swift_user = service:{{ swift_keystone_user }}
-swift_key = {{ swift_keystone_password }}
-swift_project_name = {{ swift_admin_tenant_name }}
 {% endif %}
 
 {% if enable_grafana | bool %}
diff --git a/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2 b/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
index a15d49004..2abbd6acc 100644
--- a/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
+++ b/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
@@ -130,7 +130,6 @@ HORIZON_IMAGES_UPLOAD_MODE = 'direct'
 OPENSTACK_ENDPOINT_TYPE = "internalURL"
 API_RESULT_LIMIT = 1000
 API_RESULT_PAGE_SIZE = 20
-SWIFT_FILE_TRANSFER_CHUNK_SIZE = 512 * 1024
 DROPDOWN_MAX_ITEMS = 30
 TIME_ZONE = "UTC"
 POLICY_FILES_PATH = '/etc/openstack-dashboard'
@@ -232,11 +231,6 @@ LOGGING = {
             'level': 'DEBUG',
             'propagate': False,
         },
-        'swiftclient': {
-            'handlers': ['console'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
         'openstack_auth': {
             'handlers': ['console'],
             'level': 'DEBUG',
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index 6adee1bca..92e4e485e 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -157,20 +157,6 @@ valid_interfaces = internal
 cafile = {{ openstack_cacert }}
 {% endif %}
 
-{% if enable_swift | bool %}
-[swift]
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-project_name = service
-username = {{ ironic_keystone_user }}
-password = {{ ironic_keystone_password }}
-region_name = {{ openstack_region_name }}
-valid_interfaces = internal
-cafile = {{ openstack_cacert }}
-{% endif %}
-
 [inspector]
 {% if ironic_enable_keystone_integration | bool %}
 auth_url = {{ keystone_internal_url }}
diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml
index 407a8bc65..3cdb452d2 100644
--- a/ansible/roles/loadbalancer/tasks/precheck.yml
+++ b/ansible/roles/loadbalancer/tasks/precheck.yml
@@ -686,19 +686,6 @@
     - haproxy_stat.find('rabbitmq_management') == -1
     - haproxy_vip_prechecks
 
-- name: Checking free port for Swift Proxy Server HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ swift_proxy_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - enable_swift | bool
-    - inventory_hostname in groups['loadbalancer']
-    - haproxy_stat.find('swift_api') == -1
-    - haproxy_vip_prechecks
-
 - name: Checking free port for Tacker Server HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml
index e25a073cd..943648752 100644
--- a/ansible/roles/prometheus/defaults/main.yml
+++ b/ansible/roles/prometheus/defaults/main.yml
@@ -294,10 +294,6 @@ prometheus_blackbox_exporter_endpoints_default:
       - "{{ ('skyline_console_internal:os_endpoint:' + skyline_console_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
     enabled: "{{ enable_skyline | bool }}"
   - endpoints:
-      - "swift:os_endpoint:{{ swift_public_base_endpoint }}"
-      - "{{ ('swift_internal:os_endpoint:' + swift_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
-    enabled: "{{ enable_swift | bool }}"
-  - endpoints:
       - "tacker:os_endpoint:{{ tacker_public_endpoint }}"
       - "{{ ('tacker_internal:os_endpoint:' + tacker_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
     enabled: "{{ enable_tacker | bool }}"
@@ -477,9 +473,8 @@ prometheus_libvirt_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
 
 prometheus_openstack_exporter_disabled_volume: "{{ '--disable-service.volume' if not enable_cinder | bool else '' }}"
 prometheus_openstack_exporter_disabled_dns: "{{ '--disable-service.dns' if not enable_designate | bool else '' }}"
-prometheus_openstack_exporter_disabled_object: "{{ '--disable-service.object-store' if not enable_swift | bool else '' }}"
 prometheus_openstack_exporter_disabled_lb: "{{ '--disable-service.load-balancer --disable-metric=neutron-loadbalancers --disable-metric=neutron-loadbalancers_not_active' if not enable_octavia | bool else '' }}"
-prometheus_openstack_exporter_disabled_items: "{{ [prometheus_openstack_exporter_disabled_volume, prometheus_openstack_exporter_disabled_dns, prometheus_openstack_exporter_disabled_object, prometheus_openstack_exporter_disabled_lb | trim] | join(' ') | trim }}"
+prometheus_openstack_exporter_disabled_items: "{{ [prometheus_openstack_exporter_disabled_volume, prometheus_openstack_exporter_disabled_dns, prometheus_openstack_exporter_disabled_lb | trim] | join(' ') | trim }}"
 
 prometheus_server_command: >-
   /opt/prometheus/prometheus --web.config.file=/etc/prometheus/web.yml --config.file /etc/prometheus/prometheus.yml
diff --git a/ansible/roles/skyline/templates/nginx.conf.j2 b/ansible/roles/skyline/templates/nginx.conf.j2
index 5af5b7b8b..944480464 100644
--- a/ansible/roles/skyline/templates/nginx.conf.j2
+++ b/ansible/roles/skyline/templates/nginx.conf.j2
@@ -288,17 +288,7 @@ http {
         }
         {% endif %}
 
-        {% if enable_swift | bool %}# Region: {{ openstack_region_name }}, Service: swift
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift {
-            proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ swift_proxy_server_port }}/;
-            proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ swift_proxy_server_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/;
-            proxy_buffering off;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header Host $http_host;
-        }
-        {% elif enable_ceph_rgw | bool %}# Region: {{ openstack_region_name }}, Service: ceph_rgw
+        {% if enable_ceph_rgw | bool %}# Region: {{ openstack_region_name }}, Service: ceph_rgw
         location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift {
             proxy_pass {{ internal_protocol }}://{{ ceph_rgw_internal_fqdn }}:{{ ceph_rgw_port }}/{{ 'swift' if not ceph_rgw_swift_compatibility | bool }};
             proxy_redirect {{ internal_protocol }}://{{ ceph_rgw_internal_fqdn }}:{{ ceph_rgw_port }}/{{ 'swift' if not ceph_rgw_swift_compatibility | bool }} {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/;
diff --git a/ansible/roles/skyline/templates/skyline.yaml.j2 b/ansible/roles/skyline/templates/skyline.yaml.j2
index d52950645..5a5430fde 100644
--- a/ansible/roles/skyline/templates/skyline.yaml.j2
+++ b/ansible/roles/skyline/templates/skyline.yaml.j2
@@ -74,7 +74,7 @@ openstack:
 {% if enable_neutron | bool %}
     network: neutron
 {% endif %}
-{% if enable_swift | bool or enable_ceph_rgw | bool or skyline_external_swift | bool %}
+{% if enable_ceph_rgw | bool or skyline_external_swift | bool %}
     object-store: swift
 {% endif %}
 {% if enable_heat | bool %}
diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml
deleted file mode 100644
index 9ee665ade..000000000
--- a/ansible/roles/swift/defaults/main.yml
+++ /dev/null
@@ -1,110 +0,0 @@
----
-swift_services:
-  swift-proxy-server:
-    group: swift-proxy-server
-    enabled: true
-    haproxy:
-      swift_api:
-        enabled: "{{ enable_swift }}"
-        mode: "http"
-        external: false
-        port: "{{ swift_proxy_server_listen_port }}"
-        backend_http_extra:
-          - "option httpchk /info"
-      swift_api_external:
-        enabled: "{{ enable_swift }}"
-        mode: "http"
-        external: true
-        external_fqdn: "{{ swift_external_fqdn }}"
-        port: "{{ swift_proxy_server_listen_port }}"
-        backend_http_extra:
-          - "option httpchk /info"
-
-####################
-# Docker
-####################
-swift_tag: "{{ openstack_tag }}"
-
-swift_proxy_server_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-proxy-server"
-swift_proxy_server_tag: "{{ swift_tag }}"
-swift_proxy_server_image_full: "{{ swift_proxy_server_image }}:{{ swift_proxy_server_tag }}"
-
-swift_account_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-account"
-swift_account_tag: "{{ swift_tag }}"
-swift_account_image_full: "{{ swift_account_image }}:{{ swift_account_tag }}"
-
-swift_container_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-container"
-swift_container_tag: "{{ swift_tag }}"
-swift_container_image_full: "{{ swift_container_image }}:{{ swift_container_tag }}"
-
-swift_object_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-object"
-swift_object_tag: "{{ swift_tag }}"
-swift_object_image_full: "{{ swift_object_image }}:{{ swift_object_tag }}"
-
-swift_object_expirer_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-object-expirer"
-swift_object_expirer_tag: "{{ swift_tag }}"
-swift_object_expirer_image_full: "{{ swift_object_expirer_image }}:{{ swift_object_expirer_tag }}"
-
-swift_rsyncd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}swift-rsyncd"
-swift_rsyncd_tag: "{{ swift_tag }}"
-swift_rsyncd_image_full: "{{ swift_rsyncd_image }}:{{ swift_rsyncd_tag }}"
-
-swift_log_level: "{{ 'DEBUG' if openstack_logging_debug | bool else 'INFO' }}"
-
-####################
-# OpenStack
-####################
-swift_internal_endpoint: "{{ swift_internal_base_endpoint }}/v1/AUTH_%(tenant_id)s"
-swift_public_endpoint: "{{ swift_public_base_endpoint }}/v1/AUTH_%(tenant_id)s"
-
-swift_logging_debug: "{{ openstack_logging_debug }}"
-
-swift_keystone_user: "swift"
-swift_admin_tenant_name: "admin"
-
-swift_devices_mount_point: "/srv/node"
-swift_devices_match_mode: "strict"
-swift_devices_name: "KOLLA_SWIFT_DATA"
-# For S3 API we need to defer the auth decision to allow s3api and s3token
-# middlewares to process requests using EC2 credentials.
-swift_delay_auth_decision: "{{ enable_swift_s3api | bool }}"
-
-# Boolean, true if there is a dedicated replication network.
-swift_has_replication_network: "{{ swift_storage_interface != swift_replication_interface }}"
-
-openstack_swift_auth: "{{ openstack_auth }}"
-
-syslog_server: "{{ api_interface_address }}"
-syslog_swift_facility: "local0"
-
-swift_enable_rolling_upgrade: "yes"
-
-swift_extra_ring_files: []
-
-swift_account_workers: "{{ openstack_service_workers }}"
-swift_container_workers: "{{ openstack_service_workers }}"
-swift_object_workers: "{{ openstack_service_workers }}"
-swift_proxy_server_workers: "{{ openstack_service_workers }}"
-
-####################
-# Keystone
-####################
-swift_ks_services:
-  - name: "swift"
-    type: "object-store"
-    description: "Openstack Object Storage"
-    endpoints:
-      - {'interface': 'internal', 'url': '{{ swift_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ swift_public_endpoint }}'}
-
-swift_ks_users:
-  - project: "service"
-    user: "{{ swift_keystone_user }}"
-    password: "{{ swift_keystone_password }}"
-    role: "admin"
-
-
-# FIXME(yoctozepto): These are copied from service-images-pull role.
-# Remove when the Swift role is finally migrated to new style.
-service_images_pull_retries: 3
-service_images_pull_delay: 5
diff --git a/ansible/roles/swift/handlers/main.yml b/ansible/roles/swift/handlers/main.yml
deleted file mode 100644
index b4e9116bf..000000000
--- a/ansible/roles/swift/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Restart swift-proxy-server container
-  debug:
-    msg: "Noop. No need to restart the swift-proxy-server container"
diff --git a/ansible/roles/swift/tasks/check.yml b/ansible/roles/swift/tasks/check.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/swift/tasks/check.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
deleted file mode 100644
index 4479a0c14..000000000
--- a/ansible/roles/swift/tasks/config.yml
+++ /dev/null
@@ -1,230 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
-    mode: "0770"
-  become: true
-  with_items:
-    - "swift"
-    - "swift-account-auditor"
-    - "swift-account-reaper"
-    - "swift-account-replication-server"
-    - "swift-account-replicator"
-    - "swift-account-server"
-    - "swift-container-auditor"
-    - "swift-container-replication-server"
-    - "swift-container-replicator"
-    - "swift-container-server"
-    - "swift-container-updater"
-    - "swift-object-auditor"
-    - "swift-object-expirer"
-    - "swift-object-replication-server"
-    - "swift-object-replicator"
-    - "swift-object-server"
-    - "swift-object-updater"
-    - "swift-proxy-server"
-    - "swift-rsyncd"
-
-- include_tasks: copy-certs.yml
-  when:
-    - kolla_copy_ca_into_containers | bool
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-    mode: "0660"
-  become: true
-  with_items:
-    - "swift-account-auditor"
-    - "swift-account-reaper"
-    - "swift-account-replication-server"
-    - "swift-account-replicator"
-    - "swift-account-server"
-    - "swift-container-auditor"
-    - "swift-container-replication-server"
-    - "swift-container-replicator"
-    - "swift-container-server"
-    - "swift-container-updater"
-    - "swift-object-auditor"
-    - "swift-object-expirer"
-    - "swift-object-replication-server"
-    - "swift-object-replicator"
-    - "swift-object-server"
-    - "swift-object-updater"
-    - "swift-proxy-server"
-    - "swift-rsyncd"
-
-- name: Copying over swift.conf
-  vars:
-    service_name: "swift-{{ item }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/swift.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/swift.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}/swift.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}/swift.conf"
-    dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf"
-    mode: "0660"
-  become: true
-  with_items:
-    - "account-auditor"
-    - "account-reaper"
-    - "account-replication-server"
-    - "account-replicator"
-    - "account-server"
-    - "container-auditor"
-    - "container-replication-server"
-    - "container-replicator"
-    - "container-server"
-    - "container-updater"
-    - "object-auditor"
-    - "object-expirer"
-    - "object-replication-server"
-    - "object-replicator"
-    - "object-server"
-    - "object-updater"
-    - "proxy-server"
-
-- name: Copying over account-*.conf
-  vars:
-    service_name: "swift-{{ item }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/account.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/swift/account.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
-    dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
-    mode: "0660"
-  become: true
-  when: inventory_hostname in groups['swift-account-server']
-  with_items:
-    - "account-auditor"
-    - "account-reaper"
-    - "account-replication-server"
-    - "account-replicator"
-    - "account-server"
-
-- name: Copying over container-*.conf
-  vars:
-    service_name: "swift-{{ item }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/container.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/swift/container.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
-    dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
-    mode: "0660"
-  become: true
-  when: inventory_hostname in groups['swift-container-server']
-  with_items:
-    - "container-auditor"
-    - "container-replication-server"
-    - "container-replicator"
-    - "container-server"
-    - "container-updater"
-
-- name: Copying over object-*.conf
-  vars:
-    service_name: "swift-{{ item }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/object.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/swift/object.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
-    dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
-    mode: "0660"
-  become: true
-  when: inventory_hostname in groups['swift-object-server']
-  with_items:
-    - "object-auditor"
-    - "object-expirer"
-    - "object-replication-server"
-    - "object-replicator"
-    - "object-server"
-    - "object-updater"
-
-- name: Copying over proxy-server.conf
-  vars:
-    service_name: "swift-{{ item }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/proxy-server.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
-    dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
-    mode: "0660"
-  become: true
-  when: inventory_hostname in groups['swift-proxy-server']
-  with_items:
-    - "proxy-server"
-
-- name: Copying over rsyncd.conf
-  template:
-    src: "rsyncd.conf.j2"
-    dest: "{{ node_config_directory }}/swift-rsyncd/rsyncd.conf"
-    mode: "0660"
-  become: true
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Copying over Swift ring files
-  copy:
-    src: "{{ node_custom_config }}/swift/{{ item }}"
-    dest: "{{ node_config_directory }}/swift/{{ item }}"
-    backup: yes
-    mode: "0660"
-  become: true
-  with_items:
-    - "account.builder"
-    - "account.ring.gz"
-    - "container.builder"
-    - "container.ring.gz"
-    - "object.builder"
-    - "object.ring.gz"
-    - "{{ swift_extra_ring_files }}"
-
-- name: Check if policies shall be overwritten
-  stat:
-    path: "{{ node_custom_config }}/swift/policy.json"
-  delegate_to: localhost
-  run_once: True
-  register: swift_policy
-
-- name: Copying over existing policy.json
-  template:
-    src: "{{ node_custom_config }}/swift/policy.json"
-    dest: "{{ node_config_directory }}/{{ item }}/policy.json"
-    mode: "0660"
-  with_items:
-    - "swift-account-auditor"
-    - "swift-account-reaper"
-    - "swift-account-replication-server"
-    - "swift-account-replicator"
-    - "swift-account-server"
-    - "swift-container-auditor"
-    - "swift-container-replication-server"
-    - "swift-container-replicator"
-    - "swift-container-server"
-    - "swift-container-updater"
-    - "swift-object-auditor"
-    - "swift-object-expirer"
-    - "swift-object-replication-server"
-    - "swift-object-replicator"
-    - "swift-object-server"
-    - "swift-object-updater"
-    - "swift-proxy-server"
-  when:
-    swift_policy.stat.exists
diff --git a/ansible/roles/swift/tasks/config_validate.yml b/ansible/roles/swift/tasks/config_validate.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/swift/tasks/config_validate.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/swift/tasks/copy-certs.yml b/ansible/roles/swift/tasks/copy-certs.yml
deleted file mode 100644
index dad345f18..000000000
--- a/ansible/roles/swift/tasks/copy-certs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Copy certificates and keys for {{ project_name }}"
-  import_role:
-    role: service-cert-copy
-  vars:
-    project_services: "{{ swift_services }}"
diff --git a/ansible/roles/swift/tasks/deploy-containers.yml b/ansible/roles/swift/tasks/deploy-containers.yml
deleted file mode 100644
index 1ccb8b1e6..000000000
--- a/ansible/roles/swift/tasks/deploy-containers.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- import_tasks: start.yml
diff --git a/ansible/roles/swift/tasks/deploy.yml b/ansible/roles/swift/tasks/deploy.yml
deleted file mode 100644
index 36b96f55c..000000000
--- a/ansible/roles/swift/tasks/deploy.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- import_tasks: register.yml
-
-- import_tasks: config.yml
-
-- import_tasks: start.yml
-  vars:
-    run_start_swift_proxy_server: "yes"
-
-- import_tasks: check.yml
diff --git a/ansible/roles/swift/tasks/legacy_upgrade.yml b/ansible/roles/swift/tasks/legacy_upgrade.yml
deleted file mode 100644
index f3d1fcb01..000000000
--- a/ansible/roles/swift/tasks/legacy_upgrade.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- import_tasks: config.yml
-
-# NOTE(pbourke): because the images that are used to start Swift containers
-# were refactored for Mitaka, we need to completely remove the existing
-# containers or we get a conflict when attempting to start the new ones.
-- name: "Cleaning out old Swift containers"
-  become: true
-  kolla_container:
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item }}"
-    action: "stop_container"
-  with_items:
-    - "swift_rsyncd"
-    - "swift_account_server"
-    - "swift_account_auditor"
-    - "swift_account_replication_server"
-    - "swift_account_replicator"
-    - "swift_account_reaper"
-    - "swift_container_server"
-    - "swift_container_auditor"
-    - "swift_container_replication_server"
-    - "swift_container_replicator"
-    - "swift_container_updater"
-    - "swift_object_server"
-    - "swift_object_auditor"
-    - "swift_object_replication_server"
-    - "swift_object_replicator"
-    - "swift_object_updater"
-    - "swift_object_expirer"
-    - "swift_proxy_server"
-
-- import_tasks: start.yml
-  vars:
-    run_start_swift_proxy_server: "yes"
diff --git a/ansible/roles/swift/tasks/loadbalancer.yml b/ansible/roles/swift/tasks/loadbalancer.yml
deleted file mode 100644
index 0425c6ad3..000000000
--- a/ansible/roles/swift/tasks/loadbalancer.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: "Configure loadbalancer for {{ project_name }}"
-  import_role:
-    name: loadbalancer-config
-  vars:
-    project_services: "{{ swift_services }}"
-  tags: always
diff --git a/ansible/roles/swift/tasks/main.yml b/ansible/roles/swift/tasks/main.yml
deleted file mode 100644
index bc5d1e625..000000000
--- a/ansible/roles/swift/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/swift/tasks/precheck.yml b/ansible/roles/swift/tasks/precheck.yml
deleted file mode 100644
index 5d79c7af6..000000000
--- a/ansible/roles/swift/tasks/precheck.yml
+++ /dev/null
@@ -1,132 +0,0 @@
----
-- import_role:
-    name: service-precheck
-  vars:
-    service_precheck_services: "{{ swift_services }}"
-    service_name: "{{ project_name }}"
-
-- name: Get container facts
-  become: true
-  kolla_container_facts:
-    action: get_containers
-    container_engine: "{{ kolla_container_engine }}"
-    name:
-      - swift_account_server
-      - swift_container_server
-      - swift_object_server
-      - swift_proxy_server
-  check_mode: false
-  register: container_facts
-
-- name: Checking free port for Swift Account Server
-  wait_for:
-    host: "{{ 'swift_storage' | kolla_address }}"
-    port: "{{ swift_account_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_account_server'] is not defined
-    - inventory_hostname in groups['swift-account-server']
-
-- name: Checking free port for Swift Container Server
-  wait_for:
-    host: "{{ 'swift_storage' | kolla_address }}"
-    port: "{{ swift_container_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_container_server'] is not defined
-    - inventory_hostname in groups['swift-container-server']
-
-- name: Checking free port for Swift Object Server
-  wait_for:
-    host: "{{ 'swift_storage' | kolla_address }}"
-    port: "{{ swift_object_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_object_server'] is not defined
-    - inventory_hostname in groups['swift-object-server']
-
-- name: Checking free port for Swift Account Replication Server
-  wait_for:
-    host: "{{ 'swift_replication' | kolla_address }}"
-    port: "{{ swift_account_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_account_server'] is not defined
-    - inventory_hostname in groups['swift-account-server']
-
-- name: Checking free port for Swift Container Replication Server
-  wait_for:
-    host: "{{ 'swift_replication' | kolla_address }}"
-    port: "{{ swift_container_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_container_server'] is not defined
-    - inventory_hostname in groups['swift-container-server']
-
-- name: Checking free port for Swift Object Replication Server
-  wait_for:
-    host: "{{ 'swift_replication' | kolla_address }}"
-    port: "{{ swift_object_server_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_object_server'] is not defined
-    - inventory_hostname in groups['swift-object-server']
-
-- name: Checking free port for Rsync
-  wait_for:
-    host: "{{ 'swift_replication' | kolla_address }}"
-    port: "873"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_object_server'] is not defined
-    - inventory_hostname in groups['swift-object-server']
-
-- name: Checking free port for Swift Proxy Server
-  wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ swift_proxy_server_listen_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['swift_proxy_server'] is not defined
-    - inventory_hostname in groups['swift-proxy-server']
-
-- name: Checking Swift ring files
-  run_once: True
-  stat:
-    path: "{{ node_custom_config }}/swift/{{ item }}"
-  delegate_to: localhost
-  register: swift_ring_files
-  with_items:
-    - "account.builder"
-    - "account.ring.gz"
-    - "container.builder"
-    - "container.ring.gz"
-    - "object.builder"
-    - "object.ring.gz"
-    - "{{ swift_extra_ring_files }}"
-
-- name: Fail if ring files don't exist
-  run_once: True
-  fail:
-    msg: >-
-      Swift ring files do not exist.
-      Ensure .builder and .gz are available for each of account/container/object under {{ node_custom_config }}/swift before deploying Swift.
-  with_items: '{{ swift_ring_files.results }}'
-  when:
-    - not item.stat.exists
diff --git a/ansible/roles/swift/tasks/pull.yml b/ansible/roles/swift/tasks/pull.yml
deleted file mode 100644
index b93f86257..000000000
--- a/ansible/roles/swift/tasks/pull.yml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- name: Pulling rsyncd image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_rsyncd_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Pulling swift-proxy-server image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_proxy_server_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-proxy-server']
-
-- name: Pulling swift-account image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_account_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-account-server']
-
-- name: Pulling swift-container image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_container_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-container-server']
-
-- name: Pulling swift-object image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Pulling swift-object-expirer image
-  become: true
-  kolla_container:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_expirer_image_full }}"
-  retries: "{{ service_images_pull_retries }}"
-  delay: "{{ service_images_pull_delay }}"
-  register: result
-  until: result is success
-  when: inventory_hostname in groups['swift-object-server']
diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml
deleted file mode 100644
index f3d31fca3..000000000
--- a/ansible/roles/swift/tasks/reconfigure.yml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-- name: Prepare Swift containers list
-  set_fact:
-    swift_containers:
-      - { name: swift_account_server, group: swift-account-server }
-      - { name: swift_account_auditor, group: swift-account-server }
-      - { name: swift_account_replicator, group: swift-account-server }
-      - { name: swift_account_reaper, group: swift-account-server }
-      - { name: swift_rsyncd, group: swift-account-server }
-      - { name: swift_container_server, group: swift-container-server }
-      - { name: swift_container_auditor, group: swift-container-server }
-      - { name: swift_container_replicator, group: swift-container-server }
-      - { name: swift_container_updater, group: swift-container-server }
-      - { name: swift_rsyncd, group: swift-container-server }
-      - { name: swift_object_server, group: swift-object-server }
-      - { name: swift_object_auditor, group: swift-object-server }
-      - { name: swift_object_replicator, group: swift-object-server }
-      - { name: swift_object_updater, group: swift-object-server }
-      - { name: swift_object_expirer, group: swift-object-server }
-      - { name: swift_rsyncd, group: swift-object-server }
-      - { name: swift_proxy_server, group: swift-proxy-server }
-    swift_replication_server_containers:
-      - { name: swift_account_replication_server, group: swift-account-server }
-      - { name: swift_container_replication_server, group: swift-container-server }
-      - { name: swift_object_replication_server, group: swift-object-server }
-
-- name: Add _replication_server containers to the list
-  set_fact:
-    swift_containers: "{{ swift_containers + swift_replication_server_containers }}"
-  when: swift_has_replication_network
-
-- name: Ensuring the containers up
-  become: true
-  kolla_container_facts:
-    name: "{{ item.name }}"
-    action: "get_containers_state"
-    container_engine: "{{ kolla_container_engine }}"
-  register: container_state
-  failed_when: container_state.states[item.name] != "running"
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - "{{ swift_containers }}"
-
-- import_tasks: config.yml
-
-- name: Check the configs
-  become: true
-  command: "{{ kolla_container_engine }} exec -u root {{ item.name }} /usr/local/bin/kolla_set_configs --check"
-  changed_when: false
-  failed_when: false
-  register: check_results
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - "{{ swift_containers }}"
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy
-  become: true
-  kolla_container_facts:
-    name: "{{ item.name }}"
-    action: "get_containers_env"
-    container_engine: "{{ kolla_container_engine }}"
-  register: container_envs
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - "{{ swift_containers }}"
-
-- name: Remove the containers
-  become: true
-  vars:
-    container_name: "{{ item[0]['name'] }}"
-    container_config_strategy: "{{ item[1].envs[container_name] }}"
-  kolla_container:
-    common_options: "{{ docker_common_options }}"
-    name: "{{ container_name }}"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == "COPY_ONCE" or container_config_strategy == 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - "{{ swift_containers }}"
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
-
-- include_tasks: start.yml
-  vars:
-    run_start_swift_proxy_server: "yes"
-  when: remove_containers.changed
-
-- name: Restart containers
-  become: true
-  vars:
-    container_name: "{{ item[0]['name'] }}"
-    container_config_strategy: "{{ item[1].envs[container_name] }}"
-  kolla_container:
-    common_options: "{{ docker_common_options }}"
-    name: "{{ container_name }}"
-    action: "restart_container"
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == 'COPY_ALWAYS'
-    - container_config_strategy != 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - "{{ swift_containers }}"
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml
deleted file mode 100644
index 42d0f97c7..000000000
--- a/ansible/roles/swift/tasks/register.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_swift_auth }}"
-    service_ks_register_services: "{{ swift_ks_services }}"
-    service_ks_register_users: "{{ swift_ks_users }}"
-
-- name: Creating the ResellerAdmin role
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: openstack.cloud.identity_role
-    module_args:
-      name: "ResellerAdmin"
-      region_name: "{{ openstack_region_name }}"
-      auth: "{{ openstack_swift_auth }}"
-      endpoint_type: "{{ openstack_interface }}"
-      cacert: "{{ openstack_cacert }}"
-  run_once: True
diff --git a/ansible/roles/swift/tasks/rolling_upgrade.yml b/ansible/roles/swift/tasks/rolling_upgrade.yml
deleted file mode 100644
index 1af79c1fb..000000000
--- a/ansible/roles/swift/tasks/rolling_upgrade.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- name: Prepare Swift containers list
-  set_fact:
-    swift_containers:
-      - { name: swift_account_server, group: swift-account-server }
-      - { name: swift_account_auditor, group: swift-account-server }
-      - { name: swift_account_replicator, group: swift-account-server }
-      - { name: swift_account_reaper, group: swift-account-server }
-      - { name: swift_rsyncd, group: swift-account-server }
-      - { name: swift_container_server, group: swift-container-server }
-      - { name: swift_container_auditor, group: swift-container-server }
-      - { name: swift_container_replicator, group: swift-container-server }
-      - { name: swift_container_updater, group: swift-container-server }
-      - { name: swift_rsyncd, group: swift-container-server }
-      - { name: swift_object_server, group: swift-object-server }
-      - { name: swift_object_auditor, group: swift-object-server }
-      - { name: swift_object_replicator, group: swift-object-server }
-      - { name: swift_object_updater, group: swift-object-server }
-      - { name: swift_object_expirer, group: swift-object-server }
-      - { name: swift_rsyncd, group: swift-object-server }
-
-# Upgrade swift storage nodes first
-- include_tasks: config.yml
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-# TODO(donghm): Below tasks should be run in serial nodes to
-# decrease downtime. Update once the module ansible strategy for
-# rolling upgrade will be finished.
-- name: Gracefully shutdown swift services in storage nodes
-  become: true
-  kolla_container:
-    common_options: "{{ docker_common_options }}"
-    action: "stop_container"
-    name: "{{ item.name }}"
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - "{{ swift_containers }}"
-
-- import_tasks: start.yml
-  vars:
-    run_start_swift_proxy_server: "no"
-
-# Upgrade swift proxy nodes
-- include_tasks: config.yml
-  when: inventory_hostname in groups['swift-proxy-server']
-
-- name: Gracefully shutdown swift proxy services in proxy nodes
-  become: true
-  kolla_container:
-    common_options: "{{ docker_common_options }}"
-    action: "stop_container"
-    name: "swift_proxy_server"
-  when: inventory_hostname in groups['swift-proxy-server']
-
-- name: Start new swift proxy server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_proxy_server_image_full }}"
-    name: "swift_proxy_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-proxy-server/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-  when: inventory_hostname in groups['swift-proxy-server']
diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml
deleted file mode 100644
index c97d0affa..000000000
--- a/ansible/roles/swift/tasks/start.yml
+++ /dev/null
@@ -1,317 +0,0 @@
----
-- name: Looking up disks for Swift
-  become: true
-  command: "{{ kolla_container_engine }} exec -t kolla_toolbox sudo -E ansible localhost
-    -m find_disks
-    -a \"name={{ swift_devices_name }}
-        match_mode={{ swift_devices_match_mode }}\""
-  register: swift_disk_lookup
-  changed_when: swift_disk_lookup.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1] | from_json).changed
-  failed_when: swift_disk_lookup.stdout.split()[2] != 'SUCCESS'
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Reading data from variable
-  set_fact:
-    swift_disks: "{{ (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1] | from_json).disks | from_json }}"
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Mounting Swift disks
-  become: true
-  mount:
-    src: "UUID={{ item.fs_uuid }}"
-    fstype: xfs
-    opts: "noatime,nodiratime,logbufs=8"
-    state: mounted
-    name: "{{ swift_devices_mount_point }}/{{ item['fs_label'] }}"
-  with_items: "{{ swift_disks }}"
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-rsyncd container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_rsyncd_image_full }}"
-    name: "swift_rsyncd"
-    volumes:
-      - "{{ node_config_directory }}/swift-rsyncd/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-  when: inventory_hostname in groups['swift-account-server'] or
-        inventory_hostname in groups['swift-container-server'] or
-        inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-account-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_account_server"
-    image: "{{ swift_account_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-account-server']
-
-- name: Starting swift-account-auditor container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_account_image_full }}"
-    name: "swift_account_auditor"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-auditor/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-account-server']
-
-- name: Starting swift-account-replication-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_account_image_full }}"
-    name: "swift_account_replication_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-replication-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-  when:
-    - inventory_hostname in groups['swift-account-server']
-    - swift_has_replication_network
-
-- name: Starting swift-account-replicator container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_account_image_full }}"
-    name: "swift_account_replicator"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-replicator/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-account-server']
-
-- name: Starting swift-account-reaper container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_account_image_full }}"
-    name: "swift_account_reaper"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-reaper/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-  when: inventory_hostname in groups['swift-account-server']
-
-- name: Starting swift-container-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_container_image_full }}"
-    name: "swift_container_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-container-server']
-
-- name: Starting swift-container-auditor container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_container_image_full }}"
-    name: "swift_container_auditor"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-auditor/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-container-server']
-
-- name: Starting swift-container-replication-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_container_image_full }}"
-    name: "swift_container_replication_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-replication-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-  when:
-    - inventory_hostname in groups['swift-container-server']
-    - swift_has_replication_network
-
-- name: Starting swift-container-replicator container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_container_image_full }}"
-    name: "swift_container_replicator"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-replicator/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-container-server']
-
-- name: Starting swift-container-updater container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_container_image_full }}"
-    name: "swift_container_updater"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-updater/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-container-server']
-
-- name: Starting swift-object-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_image_full }}"
-    name: "swift_object_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift:ro"
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-object-auditor container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_image_full }}"
-    name: "swift_object_auditor"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-auditor/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-object-replication-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_object_image_full }}"
-    name: "swift_object_replication_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-replication-server/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - swift_has_replication_network
-
-- name: Starting swift-object-replicator container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
-    image: "{{ swift_object_image_full }}"
-    name: "swift_object_replicator"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-replicator/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-object-updater container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_image_full }}"
-    name: "swift_object_updater"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-updater/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-object-expirer container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_object_expirer_image_full }}"
-    name: "swift_object_expirer"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-expirer/:{{ container_config_directory }}/:ro"
-      - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "swift_recon_cache:/var/cache/swift"
-  when: inventory_hostname in groups['swift-object-server']
-
-- name: Starting swift-proxy-server container
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ swift_proxy_server_image_full }}"
-    name: "swift_proxy_server"
-    volumes:
-      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-proxy-server/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-  when: inventory_hostname in groups['swift-proxy-server'] and
-        run_start_swift_proxy_server | bool
diff --git a/ansible/roles/swift/tasks/stop.yml b/ansible/roles/swift/tasks/stop.yml
deleted file mode 100644
index ae3b39fe3..000000000
--- a/ansible/roles/swift/tasks/stop.yml
+++ /dev/null
@@ -1,151 +0,0 @@
----
-- name: Stopping swift-rsyncd container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_rsyncd"
-  when: (inventory_hostname in groups['swift-account-server'] or
-          inventory_hostname in groups['swift-container-server'] or
-          inventory_hostname in groups['swift-object-server']) and
-          'swift_rsyncd' not in skip_stop_containers
-
-- name: Stopping swift-account-server container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_account_server"
-  when:
-    - inventory_hostname in groups['swift-account-server']
-    - "'swift_account_server' not in skip_stop_containers"
-
-- name: Stopping swift-account-auditor container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_account_auditor"
-  when:
-    - inventory_hostname in groups['swift-account-server']
-    - "'swift_object_auditor' not in skip_stop_containers"
-
-- name: Stopping swift-account-replicator container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_account_replicator"
-  when:
-    - inventory_hostname in groups['swift-account-server']
-    - "'swift_account_replicator' not in skip_stop_containers"
-
-- name: Stopping swift-account-reaper container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_account_reaper"
-  when:
-    - inventory_hostname in groups['swift-account-server']
-    - "'swift_account_reaper' not in skip_stop_containers"
-
-- name: Stopping swift-container-server container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_container_server"
-  when:
-    - inventory_hostname in groups['swift-container-server']
-    - "'swift_container_server' not in skip_stop_containers"
-
-- name: Stopping swift-container-auditor container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_container_auditor"
-  when:
-    - inventory_hostname in groups['swift-container-server']
-    - "'swift_container_auditor' not in skip_stop_containers"
-
-- name: Stopping swift-container-replicator container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_container_replicator"
-  when:
-    - inventory_hostname in groups['swift-container-server']
-    - "'swift_container_replicator' not in skip_stop_containers"
-
-- name: Stopping swift-container-updater container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_container_updater"
-  when:
-    - inventory_hostname in groups['swift-container-server']
-    - "'swift_container_updater' not in skip_stop_containers"
-
-- name: Stopping swift-object-server container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_object_server"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - "'swift_object_server' not in skip_stop_containers"
-
-- name: Stopping swift-object-auditor container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_object_auditor"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - "'swift_object_auditor' not in skip_stop_containers"
-
-- name: Stopping swift-object-replicator container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_object_replicator"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - "'swift_object_replicator' not in skip_stop_containers"
-
-- name: Stopping swift-object-updater container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_object_updater"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - "'swift_object_updater' not in skip_stop_containers"
-
-- name: Stopping swift-object-expirer container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_object_expirer"
-  when:
-    - inventory_hostname in groups['swift-object-server']
-    - "'swift_object_expirer' not in skip_stop_containers"
-
-- name: Stopping swift-proxy-server container
-  become: true
-  kolla_container:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "swift_proxy_server"
-  when:
-    - inventory_hostname in groups['swift-proxy-server']
-    - "'swift_proxy_server' not in skip_stop_containers"
diff --git a/ansible/roles/swift/tasks/upgrade.yml b/ansible/roles/swift/tasks/upgrade.yml
deleted file mode 100644
index 716216128..000000000
--- a/ansible/roles/swift/tasks/upgrade.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include_tasks: rolling_upgrade.yml
-  when: swift_enable_rolling_upgrade | bool
-
-- include_tasks: legacy_upgrade.yml
-  when: not swift_enable_rolling_upgrade | bool
diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2
deleted file mode 100644
index e12891c3c..000000000
--- a/ansible/roles/swift/templates/account.conf.j2
+++ /dev/null
@@ -1,40 +0,0 @@
-{% set network = 'swift_replication' if 'replicat' in service_name else 'swift_storage' %}
-[DEFAULT]
-bind_ip = {{ network | kolla_address }}
-bind_port = {{ swift_account_server_port }}
-devices = {{ swift_devices_mount_point }}
-mount_check = false
-log_udp_host = {{ syslog_server }}
-log_udp_port = {{ syslog_udp_port }}
-log_name = {{ service_name }}
-log_facility = {{ syslog_swift_facility }}
-log_level = {{ swift_log_level }}
-workers = {{ swift_account_workers }}
-
-[pipeline:main]
-pipeline = {% if enable_swift_recon %}recon {% endif %}account-server
-
-{% if enable_swift_recon %}
-[filter:recon]
-use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-{% endif %}
-
-[app:account-server]
-use = egg:swift#account
-{% if swift_has_replication_network %}
-replication_server = {{ service_name == 'swift-account-replication-server' }}
-{% endif %}
-
-{% if service_name == 'swift-account-auditor' %}
-[account-auditor]
-{% endif %}
-
-{% if service_name == 'swift-account-replicator' %}
-[account-replicator]
-rsync_module = {replication_ip}::account
-{% endif %}
-
-{% if service_name == 'swift-account-reaper' %}
-[account-reaper]
-{% endif %}
diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2
deleted file mode 100644
index 63a9515f5..000000000
--- a/ansible/roles/swift/templates/container.conf.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-{% set network = 'swift_replication' if 'replicat' in service_name else 'swift_storage' %}
-[DEFAULT]
-bind_ip = {{ network | kolla_address }}
-bind_port = {{ swift_container_server_port }}
-devices = {{ swift_devices_mount_point }}
-mount_check = false
-log_udp_host = {{ syslog_server }}
-log_udp_port = {{ syslog_udp_port }}
-log_name = {{ service_name }}
-log_facility = {{ syslog_swift_facility }}
-log_level = {{ swift_log_level }}
-workers = {{ swift_container_workers }}
-
-[pipeline:main]
-pipeline = {% if enable_swift_recon %}recon {% endif %}container-server
-
-{% if enable_swift_recon %}
-[filter:recon]
-use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-{% endif %}
-
-[app:container-server]
-use = egg:swift#container
-allow_versions = true
-{% if swift_has_replication_network %}
-replication_server = {{ service_name == 'swift-container-replication-server' }}
-{% endif %}
-
-{% if service_name == 'swift-container-auditor' %}
-[container-auditor]
-{% endif %}
-
-{% if service_name == 'swift-container-replicator' %}
-[container-replicator]
-rsync_module = {replication_ip}::container
-{% endif %}
-
-{% if service_name == 'swift-container-updater' %}
-[container-updater]
-{% endif %}
diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2
deleted file mode 100644
index 0c26734b6..000000000
--- a/ansible/roles/swift/templates/object.conf.j2
+++ /dev/null
@@ -1,52 +0,0 @@
-{% set network = 'swift_replication' if 'replicat' in service_name else 'swift_storage' %}
-[DEFAULT]
-bind_ip = {{ network | kolla_address }}
-bind_port = {{ swift_object_server_port }}
-devices = {{ swift_devices_mount_point }}
-mount_check = false
-
-log_udp_host = {{ syslog_server }}
-log_udp_port = {{ syslog_udp_port }}
-log_name = {{ service_name }}
-log_facility = {{ syslog_swift_facility }}
-log_level = {{ swift_log_level }}
-workers = {{ swift_object_workers }}
-
-[pipeline:main]
-{% if service_name == 'swift-object-expirer' %}
-pipeline = proxy-server
-{% else %}
-pipeline = {% if enable_swift_recon %}recon {% endif %}object-server
-{% endif %}
-
-{% if enable_swift_recon %}
-[filter:recon]
-use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-{% endif %}
-
-[app:object-server]
-use = egg:swift#object
-{% if swift_has_replication_network %}
-replication_server = {{ service_name == 'swift-object-replication-server' }}
-{% endif %}
-
-{% if service_name == 'swift-object-auditor' %}
-[object-auditor]
-{% endif %}
-
-[object-replicator]
-{% if service_name == 'swift-object-replicator' %}
-rsync_module = {replication_ip}::object
-{% endif %}
-
-{% if service_name == 'swift-object-updater' %}
-[object-updater]
-{% endif %}
-
-{% if service_name == 'swift-object-expirer' %}
-[object-expirer]
-
-[app:proxy-server]
-use = egg:swift#proxy
-{% endif %}
diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
deleted file mode 100644
index 0a808ea90..000000000
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ /dev/null
@@ -1,103 +0,0 @@
-[DEFAULT]
-bind_ip = {{ api_interface_address }}
-bind_port = {{ swift_proxy_server_listen_port }}
-
-log_udp_host = {{ syslog_server }}
-log_udp_port = {{ syslog_udp_port }}
-log_name = {{ service_name }}
-log_facility = {{ syslog_swift_facility }}
-log_level = {{ swift_log_level }}
-workers = {{ swift_proxy_server_workers }}
-
-[pipeline:main]
-pipeline = catch_errors gatekeeper healthcheck cache container_sync bulk tempurl ratelimit authtoken {% if enable_swift_s3api | bool %}s3api s3token {% endif %}keystoneauth container_quotas account_quotas slo dlo {% if enable_ceilometer | bool %}ceilometer {% endif %}proxy-server
-
-[app:proxy-server]
-use = egg:swift#proxy
-allow_account_management = true
-account_autocreate = true
-
-[filter:tempurl]
-use = egg:swift#tempurl
-
-[filter:cache]
-use = egg:swift#memcache
-memcache_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-[filter:catch_errors]
-use = egg:swift#catch_errors
-
-[filter:healthcheck]
-use = egg:swift#healthcheck
-
-[filter:proxy-logging]
-use = egg:swift#proxy_logging
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-auth_uri = {{ keystone_internal_url }}
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-project_name = service
-username = {{ swift_keystone_user }}
-password = {{ swift_keystone_password }}
-delay_auth_decision = {{ swift_delay_auth_decision }}
-cafile = {{ openstack_cacert }}
-
-memcache_security_strategy = {{ memcache_security_strategy }}
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-
-[filter:keystoneauth]
-use = egg:swift#keystoneauth
-operator_roles = admin,{{ keystone_default_user_role }},ResellerAdmin
-
-{% if enable_ceilometer | bool %}
-[filter:ceilometer]
-paste.filter_factory = ceilometermiddleware.swift:filter_factory
-control_exchange = swift
-url = {{ notify_transport_url }}
-driver = messagingv2
-topic = notifications
-log_level = WARN
-{% endif %}
-
-[filter:container_sync]
-use = egg:swift#container_sync
-
-[filter:bulk]
-use = egg:swift#bulk
-
-[filter:ratelimit]
-use = egg:swift#ratelimit
-
-[filter:gatekeeper]
-use = egg:swift#gatekeeper
-
-[filter:account_quotas]
-use = egg:swift#account_quotas
-
-[filter:container_quotas]
-use = egg:swift#container_quotas
-
-[filter:slo]
-use = egg:swift#slo
-
-[filter:dlo]
-use = egg:swift#dlo
-
-[filter:versioned_writes]
-use = egg:swift#versioned_writes
-allow_versioned_writes = true
-
-{% if enable_swift_s3api | bool %}
-[filter:s3api]
-use = egg:swift#s3api
-
-[filter:s3token]
-use = egg:swift#s3token
-auth_uri = {{ keystone_internal_url }}/v3
-{% endif %}
diff --git a/ansible/roles/swift/templates/rsyncd.conf.j2 b/ansible/roles/swift/templates/rsyncd.conf.j2
deleted file mode 100644
index d23291330..000000000
--- a/ansible/roles/swift/templates/rsyncd.conf.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-address = {{ 'swift_replication' | kolla_address }}
-
-{% if inventory_hostname in groups['swift-account-server'] %}
-[account]
-max connections = 2
-path = {{ swift_devices_mount_point }}
-read only = false
-use chroot = no
-lock file = /var/lib/swift/lock/account.lock
-{% endif %}
-
-{% if inventory_hostname in groups['swift-container-server'] %}
-[container]
-max connections = 4
-path = {{ swift_devices_mount_point }}
-read only = false
-use chroot = no
-lock file = /var/lib/swift/lock/container.lock
-{% endif %}
-
-{% if inventory_hostname in groups['swift-object-server'] %}
-[object]
-max connections = 8
-path = {{ swift_devices_mount_point }}
-read only = false
-use chroot = no
-lock file = /var/lib/swift/lock/object.lock
-{% endif %}
diff --git a/ansible/roles/swift/templates/swift-account-auditor.json.j2 b/ansible/roles/swift/templates/swift-account-auditor.json.j2
deleted file mode 100644
index 4599a6be4..000000000
--- a/ansible/roles/swift/templates/swift-account-auditor.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-account-auditor /etc/swift/account-auditor.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/account-auditor.conf",
-            "dest": "/etc/swift/account-auditor.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-account-reaper.json.j2 b/ansible/roles/swift/templates/swift-account-reaper.json.j2
deleted file mode 100644
index ec45a6f6b..000000000
--- a/ansible/roles/swift/templates/swift-account-reaper.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-account-reaper /etc/swift/account-reaper.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/account-reaper.conf",
-            "dest": "/etc/swift/account-reaper.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-account-replication-server.json.j2 b/ansible/roles/swift/templates/swift-account-replication-server.json.j2
deleted file mode 100644
index 296244493..000000000
--- a/ansible/roles/swift/templates/swift-account-replication-server.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-account-server /etc/swift/account-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/account-replication-server.conf",
-            "dest": "/etc/swift/account-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-account-replicator.json.j2 b/ansible/roles/swift/templates/swift-account-replicator.json.j2
deleted file mode 100644
index ec57074a6..000000000
--- a/ansible/roles/swift/templates/swift-account-replicator.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-account-replicator /etc/swift/account-replicator.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/account-replicator.conf",
-            "dest": "/etc/swift/account-replicator.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-account-server.json.j2 b/ansible/roles/swift/templates/swift-account-server.json.j2
deleted file mode 100644
index ee66f112e..000000000
--- a/ansible/roles/swift/templates/swift-account-server.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-account-server /etc/swift/account-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/account-server.conf",
-            "dest": "/etc/swift/account-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-container-auditor.json.j2 b/ansible/roles/swift/templates/swift-container-auditor.json.j2
deleted file mode 100644
index 0ce8103ad..000000000
--- a/ansible/roles/swift/templates/swift-container-auditor.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-container-auditor /etc/swift/container-auditor.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/container-auditor.conf",
-            "dest": "/etc/swift/container-auditor.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-container-replication-server.json.j2 b/ansible/roles/swift/templates/swift-container-replication-server.json.j2
deleted file mode 100644
index 4a3415bd0..000000000
--- a/ansible/roles/swift/templates/swift-container-replication-server.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-container-server /etc/swift/container-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/container-replication-server.conf",
-            "dest": "/etc/swift/container-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-container-replicator.json.j2 b/ansible/roles/swift/templates/swift-container-replicator.json.j2
deleted file mode 100644
index ac9d7b882..000000000
--- a/ansible/roles/swift/templates/swift-container-replicator.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-container-replicator /etc/swift/container-replicator.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/container-replicator.conf",
-            "dest": "/etc/swift/container-replicator.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-container-server.json.j2 b/ansible/roles/swift/templates/swift-container-server.json.j2
deleted file mode 100644
index ff52bd092..000000000
--- a/ansible/roles/swift/templates/swift-container-server.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "swift-container-server /etc/swift/container-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/container-server.conf",
-            "dest": "/etc/swift/container-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-container-updater.json.j2 b/ansible/roles/swift/templates/swift-container-updater.json.j2
deleted file mode 100644
index 42f070e07..000000000
--- a/ansible/roles/swift/templates/swift-container-updater.json.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "command": "swift-container-updater /etc/swift/container-updater.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/container-updater.conf",
-            "dest": "/etc/swift/container-updater.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-auditor.json.j2 b/ansible/roles/swift/templates/swift-object-auditor.json.j2
deleted file mode 100644
index c25aadb85..000000000
--- a/ansible/roles/swift/templates/swift-object-auditor.json.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "command": "swift-object-auditor /etc/swift/object-auditor.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-auditor.conf",
-            "dest": "/etc/swift/object-auditor.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-expirer.json.j2 b/ansible/roles/swift/templates/swift-object-expirer.json.j2
deleted file mode 100644
index f000f7ad6..000000000
--- a/ansible/roles/swift/templates/swift-object-expirer.json.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "command": "swift-object-expirer /etc/swift/object-expirer.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-expirer.conf",
-            "dest": "/etc/swift/object-expirer.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-replication-server.json.j2 b/ansible/roles/swift/templates/swift-object-replication-server.json.j2
deleted file mode 100644
index f9697a1fe..000000000
--- a/ansible/roles/swift/templates/swift-object-replication-server.json.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "command": "swift-object-server /etc/swift/object-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-replication-server.conf",
-            "dest": "/etc/swift/object-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-replicator.json.j2 b/ansible/roles/swift/templates/swift-object-replicator.json.j2
deleted file mode 100644
index a66f7c19b..000000000
--- a/ansible/roles/swift/templates/swift-object-replicator.json.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "command": "swift-object-replicator /etc/swift/object-replicator.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-replicator.conf",
-            "dest": "/etc/swift/object-replicator.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-server.json.j2 b/ansible/roles/swift/templates/swift-object-server.json.j2
deleted file mode 100644
index d9344cffe..000000000
--- a/ansible/roles/swift/templates/swift-object-server.json.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "command": "swift-object-server /etc/swift/object-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-server.conf",
-            "dest": "/etc/swift/object-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-object-updater.json.j2 b/ansible/roles/swift/templates/swift-object-updater.json.j2
deleted file mode 100644
index 2c665e5b9..000000000
--- a/ansible/roles/swift/templates/swift-object-updater.json.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "command": "swift-object-updater /etc/swift/object-updater.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/object-updater.conf",
-            "dest": "/etc/swift/object-updater.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-proxy-server.json.j2 b/ansible/roles/swift/templates/swift-proxy-server.json.j2
deleted file mode 100644
index d0fa0b6f3..000000000
--- a/ansible/roles/swift/templates/swift-proxy-server.json.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "command": "swift-proxy-server /etc/swift/proxy-server.conf --verbose",
-    "config_files": [
-        {
-            "source": "/var/lib/kolla/swift/account.ring.gz",
-            "dest": "/etc/swift/account.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/container.ring.gz",
-            "dest": "/etc/swift/container.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "/var/lib/kolla/swift/object.ring.gz",
-            "dest": "/etc/swift/object.ring.gz",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% for ring in swift_extra_ring_files %}
-        {
-            "source": "/var/lib/kolla/swift/{{ ring }}",
-            "dest": "/etc/swift/{{ ring }}",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {% endfor %}
-        {
-            "source": "{{ container_config_directory }}/swift.conf",
-            "dest": "/etc/swift/swift.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/proxy-server.conf",
-            "dest": "/etc/swift/proxy-server.conf",
-            "owner": "swift",
-            "perm": "0640"
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/swift/policy.json",
-            "owner": "swift",
-            "perm": "0600",
-            "optional": true
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift-rsyncd.json.j2 b/ansible/roles/swift/templates/swift-rsyncd.json.j2
deleted file mode 100644
index 29045d987..000000000
--- a/ansible/roles/swift/templates/swift-rsyncd.json.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "command": "/usr/bin/rsync --daemon --no-detach --port={{ swift_rsync_port }} --config=/etc/rsyncd.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/rsyncd.conf",
-            "dest": "/etc/rsyncd.conf",
-            "owner": "swift",
-            "perm": "0640"
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/swift/templates/swift.conf.j2 b/ansible/roles/swift/templates/swift.conf.j2
deleted file mode 100644
index 917a32cf1..000000000
--- a/ansible/roles/swift/templates/swift.conf.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-[swift-hash]
-swift_hash_path_suffix = {{ swift_hash_path_suffix }}
-swift_hash_path_prefix = {{ swift_hash_path_prefix }}
diff --git a/ansible/roles/swift/vars/main.yml b/ansible/roles/swift/vars/main.yml
deleted file mode 100644
index 7fe7983d3..000000000
--- a/ansible/roles/swift/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-project_name: "swift"
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index cc85f0c67..bbc7c959a 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -27,7 +27,6 @@ remote_neutron_client = trove.common.clients_admin.neutron_client_trove_admin
 nova_compute_endpoint_type = internalURL
 neutron_endpoint_type = internalURL
 cinder_endpoint_type = internalURL
-swift_endpoint_type = internalURL
 glance_endpoint_type = internalURL
 trove_endpoint_type = internalURL
 
diff --git a/ansible/site.yml b/ansible/site.yml
index e4e7ce233..de12b439c 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -65,7 +65,6 @@
         - enable_rabbitmq_{{ enable_rabbitmq | bool }}
         - enable_redis_{{ enable_redis | bool }}
         - enable_skyline_{{ enable_skyline | bool }}
-        - enable_swift_{{ enable_swift | bool }}
         - enable_tacker_{{ enable_tacker | bool }}
         - enable_telegraf_{{ enable_telegraf | bool }}
         - enable_trove_{{ enable_trove | bool }}
@@ -292,11 +291,6 @@
           tags: skyline
           when: enable_skyline | bool
         - include_role:
-            name: swift
-            tasks_from: loadbalancer
-          tags: swift
-          when: enable_swift | bool
-        - include_role:
             name: tacker
             tasks_from: loadbalancer
           tags: tacker
@@ -504,23 +498,6 @@
     - { role: opensearch,
         tags: opensearch }
 
-- name: Apply role swift
-  gather_facts: false
-  hosts:
-    - swift-account-server
-    - swift-container-server
-    - swift-object-server
-    - swift-proxy-server
-    - '&enable_swift_True'
-  serial: '{{ kolla_serial|default("0") }}'
-  max_fail_percentage: >-
-    {{ swift_max_fail_percentage |
-       default(kolla_max_fail_percentage) |
-       default(100) }}
-  roles:
-    - { role: swift,
-        tags: swift }
-
 - name: Apply role ceph-rgw
   gather_facts: false
   hosts: