Remove swift_storage/replication_address pretasks
We have moved the calculation of the swift_repl and storage addresses to the swift role itself, to ensure uniformity: https://review.openstack.org/#/c/375528/ As a result, this PR removes these steps from the playbook as they are now redundant. Change-Id: Iac72c99fc728fad82da65ae6c68a304e3d130bc1
This commit is contained in:
parent
762216462b
commit
e41eea30ba
|
@ -19,13 +19,6 @@
|
|||
hosts: "{{ swift_groups | default('swift_all:swift_remote_all') }}"
|
||||
user: root
|
||||
gather_facts: true
|
||||
pre_tasks:
|
||||
- name: Set swift replication address (container)
|
||||
set_fact:
|
||||
replication_address: "{{ hostvars[inventory_hostname]['container_networks']['replication_address']['address'] }}"
|
||||
when:
|
||||
- inventory_hostname in groups['swift_all']
|
||||
- hostvars[inventory_hostname]['container_networks']['replication_address']['address'] is defined
|
||||
roles:
|
||||
- role: "{{ swift_rolename | default('os_swift') }}"
|
||||
vars_files:
|
||||
|
|
|
@ -201,8 +201,6 @@ swift_venv_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"
|
|||
swift_service_publicuri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_host'] }}:8080"
|
||||
swift_service_adminuri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_host'] }}:8080"
|
||||
swift_service_internaluri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_host'] }}:8080"
|
||||
swift_replication_address: "{{ replication_address }}"
|
||||
swift_storage_address: "{{ storage_address }}"
|
||||
swift:
|
||||
storage_network: "{{ test_swift_storage_network | default('eth2') }}"
|
||||
replication_network: "{{ test_swift_repl_network | default('eth3') }}"
|
||||
|
|
Loading…
Reference in New Issue