openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Use config_template as a collection

Browse Source 
Since we still use ceph-ansible that has their own implementation of
config_template module it's worth to use mentioned module as a collection
explicitly.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/819814



Change-Id: Iff0959a012d1875e01cd72bee3fb75906ef0983a
This commit is contained in:
Dmitriy Rabotyagov 2021-11-30 15:17:27 +02:00
parent b96ce88221
commit 87c7b60d65
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/swift_post_install.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: Copy swift config - name: Copy swift config
config_template: openstack.config_template.config_template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"

4
tasks/swift_proxy_hosts.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: swift proxy server configuration - name: swift proxy server configuration
config_template: openstack.config_template.config_template:
src: "proxy-server.conf.j2" src: "proxy-server.conf.j2"
dest: "/etc/swift/proxy-server/proxy-server.conf" dest: "/etc/swift/proxy-server/proxy-server.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -26,7 +26,7 @@
# If we've specified a container-sync realm use container-sync-realms.conf # If we've specified a container-sync realm use container-sync-realms.conf
- name: "Swift container-sync configuration" - name: "Swift container-sync configuration"
config_template: openstack.config_template.config_template:
src: "container-sync-realms.conf.j2" src: "container-sync-realms.conf.j2"
dest: "/etc/swift/container-sync-realms.conf" dest: "/etc/swift/container-sync-realms.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"

4
tasks/swift_storage_hosts_account.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: "Swift account server configuration" - name: "Swift account server configuration"
config_template: openstack.config_template.config_template:
src: "account-server.conf.j2" src: "account-server.conf.j2"
dest: "/etc/swift/account-server/account-server.conf" dest: "/etc/swift/account-server/account-server.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -26,7 +26,7 @@
# We only create the dedicated replicator configuration when using a dedicated replication_network # We only create the dedicated replicator configuration when using a dedicated replication_network
- name: "Swift account server replicator configuration" - name: "Swift account server replicator configuration"
config_template: openstack.config_template.config_template:
src: "account-server-replicator.conf.j2" src: "account-server-replicator.conf.j2"
dest: "/etc/swift/account-server/account-server-replicator.conf" dest: "/etc/swift/account-server/account-server-replicator.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"

6
tasks/swift_storage_hosts_container.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: "Swift container server configuration" - name: "Swift container server configuration"
config_template: openstack.config_template.config_template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -39,7 +39,7 @@
# If we've specified a container-sync realm use container-sync-realms.conf # If we've specified a container-sync realm use container-sync-realms.conf
- name: "Swift container-sync configuration" - name: "Swift container-sync configuration"
config_template: openstack.config_template.config_template:
src: "container-sync-realms.conf.j2" src: "container-sync-realms.conf.j2"
dest: "/etc/swift/container-sync-realms.conf" dest: "/etc/swift/container-sync-realms.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -53,7 +53,7 @@
# We only create the dedicated replicator configuration when using a dedicated replication_network # We only create the dedicated replicator configuration when using a dedicated replication_network
- name: "Swift container server replicator configuration" - name: "Swift container server replicator configuration"
config_template: openstack.config_template.config_template:
src: "container-server-replicator.conf.j2" src: "container-server-replicator.conf.j2"
dest: "/etc/swift/container-server/container-server-replicator.conf" dest: "/etc/swift/container-server/container-server-replicator.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"

6
tasks/swift_storage_hosts_object.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: "Swift object server configuration" - name: "Swift object server configuration"
config_template: openstack.config_template.config_template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -35,7 +35,7 @@
# We only create the dedicated replicator configuration when using a dedicated replication_network # We only create the dedicated replicator configuration when using a dedicated replication_network
- name: "Swift object server replicator configuration" - name: "Swift object server replicator configuration"
config_template: openstack.config_template.config_template:
src: "object-server-replicator.conf.j2" src: "object-server-replicator.conf.j2"
dest: "/etc/swift/object-server/object-server-replicator.conf" dest: "/etc/swift/object-server/object-server-replicator.conf"
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"
@ -54,7 +54,7 @@
when: not swift_dedicated_replication | bool when: not swift_dedicated_replication | bool
- name: Deploy drive-audit configuration file - name: Deploy drive-audit configuration file
config_template: openstack.config_template.config_template:
src: drive-audit.conf.j2 src: drive-audit.conf.j2
dest: /etc/swift/drive-audit.conf dest: /etc/swift/drive-audit.conf
owner: "{{ swift_system_user_name }}" owner: "{{ swift_system_user_name }}"