Skip to content

Commit 3cabfbb

Browse files
committed
Remove Swift support
Kolla ansible dropped Swift support since [1]. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/945113
1 parent 3c97e52 commit 3cabfbb

File tree

9 files changed

+0
-116
lines changed

9 files changed

+0
-116
lines changed

etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,6 @@ network
159159
[manila-data:children]
160160
manila
161161

162-
# Swift
163-
[swift-proxy-server:children]
164-
swift
165-
166-
[swift-account-server:children]
167-
storage
168-
169-
[swift-container-server:children]
170-
storage
171-
172-
[swift-object-server:children]
173-
storage
174-
175162
# Barbican
176163
[barbican-api:children]
177164
barbican

etc/kayobe/environments/ci-aio/networks.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ storage_net_name: aio
5959
#storage_mgmt_net_name:
6060
storage_mgmt_net_name: aio
6161

62-
# Name of the network used to carry swift storage data traffic.
63-
#swift_storage_net_name:
64-
swift_storage_net_name: aio
65-
66-
# Name of the network used to carry swift storage replication traffic.
67-
#swift_storage_replication_net_name:
68-
swift_storage_replication_net_name: aio
69-
7062
# Name of the network used to perform hardware introspection on the bare metal
7163
# workload hosts.
7264
#inspection_net_name:

etc/kayobe/environments/ci-builder/networks.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ storage_net_name: aio
5959
#storage_mgmt_net_name:
6060
storage_mgmt_net_name: aio
6161

62-
# Name of the network used to carry swift storage data traffic.
63-
#swift_storage_net_name:
64-
swift_storage_net_name: aio
65-
66-
# Name of the network used to carry swift storage replication traffic.
67-
#swift_storage_replication_net_name:
68-
swift_storage_replication_net_name: aio
69-
7062
# Name of the network used to perform hardware introspection on the bare metal
7163
# workload hosts.
7264
#inspection_net_name:

etc/kayobe/environments/ci-multinode/networks.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ storage_net_name: storage
5454
#storage_mgmt_net_name:
5555
storage_mgmt_net_name: storage_mgmt
5656

57-
# Name of the network used to carry swift storage data traffic.
58-
#swift_storage_net_name:
59-
60-
# Name of the network used to carry swift storage replication traffic.
61-
#swift_storage_replication_net_name:
62-
6357
# Name of the network used to perform hardware introspection on the bare metal
6458
# workload hosts.
6559
#inspection_net_name:

etc/kayobe/kolla.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -728,9 +728,6 @@ kolla_enable_prometheus: true
728728
#kolla_enable_rabbitmq:
729729
#kolla_enable_redis:
730730
#kolla_enable_skyline:
731-
#kolla_enable_swift:
732-
#kolla_enable_swift_recon:
733-
#kolla_enable_swift_s3api:
734731
#kolla_enable_tacker:
735732
#kolla_enable_telegraf:
736733
#kolla_enable_trove:

etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,3 @@ stackhpc_prometheus_blackbox_exporter_endpoints_default:
6262
enabled: "{{ enable_ironic | bool }}"
6363
- endpoints: "{% set ironic_inspector_endpoints = [] %}{% for host in groups.get('ironic-inspector', []) %}{{ ironic_inspector_endpoints.append('ironic_inspector_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['ironic_inspector_port']) }}{% endfor %}{{ ironic_inspector_endpoints }}"
6464
enabled: "{{ enable_ironic | bool }}"
65-
- endpoints: "{% set swift_endpoints = [] %}{% for host in groups.get('swift-api', []) %}{{ swift_endpoints.append('swift_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['swift_api_port']) }}{% endfor %}{{ swift_endpoints }}"
66-
enabled: "{{ enable_swift | bool }}"

etc/kayobe/networks.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
# Name of the network used to carry storage management traffic.
4646
#storage_mgmt_net_name:
4747

48-
# Name of the network used to carry swift storage data traffic.
49-
#swift_storage_net_name:
50-
51-
# Name of the network used to carry swift storage replication traffic.
52-
#swift_storage_replication_net_name:
53-
5448
# Name of the network used to perform hardware introspection on the bare metal
5549
# workload hosts.
5650
#inspection_net_name:

etc/kayobe/storage.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
# List of extra networks to which storage nodes are attached.
1919
#storage_extra_network_interfaces:
2020

21-
# Whether this host requires access to Swift networks.
22-
#storage_needs_swift_network:
23-
24-
#storage_needs_swift_replication_network:
25-
2621
###############################################################################
2722
# Storage node BIOS configuration.
2823

etc/kayobe/swift.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)