Skip to content
Snippets Groups Projects
Commit c453d09b authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Swift: compute the list of containers dynamically in the reconfigure task"

parents 6cba8458 9622ab96
No related branches found
No related tags found
No related merge requests found
--- ---
- 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 - name: Ensuring the containers up
become: true become: true
kolla_docker: kolla_docker:
...@@ -8,26 +38,7 @@ ...@@ -8,26 +38,7 @@
failed_when: container_state.Running == false failed_when: container_state.Running == false
when: inventory_hostname in groups[item.group] when: inventory_hostname in groups[item.group]
with_items: with_items:
- { name: swift_account_server, group: swift-account-server } - "{{ swift_containers }}"
- { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replication_server, 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_replication_server, 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_replication_server, 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 }
- include_tasks: config.yml - include_tasks: config.yml
...@@ -39,26 +50,7 @@ ...@@ -39,26 +50,7 @@
register: check_results register: check_results
when: inventory_hostname in groups[item.group] when: inventory_hostname in groups[item.group]
with_items: with_items:
- { name: swift_account_server, group: swift-account-server } - "{{ swift_containers }}"
- { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replication_server, 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_replication_server, 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_replication_server, 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 }
# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS' # NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', # and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
...@@ -71,26 +63,7 @@ ...@@ -71,26 +63,7 @@
register: container_envs register: container_envs
when: inventory_hostname in groups[item.group] when: inventory_hostname in groups[item.group]
with_items: with_items:
- { name: swift_account_server, group: swift-account-server } - "{{ swift_containers }}"
- { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replication_server, 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_replication_server, 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_replication_server, 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 }
- name: Remove the containers - name: Remove the containers
become: true become: true
...@@ -103,26 +76,7 @@ ...@@ -103,26 +76,7 @@
- config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
- item[2]['rc'] == 1 - item[2]['rc'] == 1
with_together: with_together:
- [{ name: swift_account_server, group: swift-account-server }, - "{{ swift_containers }}"
{ name: swift_account_auditor, group: swift-account-server },
{ name: swift_account_replication_server, 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_replication_server, 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_replication_server, 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 }]
- "{{ container_envs.results }}" - "{{ container_envs.results }}"
- "{{ check_results.results }}" - "{{ check_results.results }}"
...@@ -142,25 +96,6 @@ ...@@ -142,25 +96,6 @@
- item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
- item[2]['rc'] == 1 - item[2]['rc'] == 1
with_together: with_together:
- [{ name: swift_account_server, group: swift-account-server }, - "{{ swift_containers }}"
{ name: swift_account_auditor, group: swift-account-server },
{ name: swift_account_replication_server, 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_replication_server, 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_replication_server, 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 }]
- "{{ container_envs.results }}" - "{{ container_envs.results }}"
- "{{ check_results.results }}" - "{{ check_results.results }}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment