Add ability to set up Swift container-sync realms
This will allow the specification of container-sync realms via the swift_container_sync_realms variable (documented in the defaults/main.yml within the os_swift role). Creating a conf file that is then used to enable and utilise container-sync Realms within Swift. Change-Id: Icf71d008765ff83743f6ab28ef0cea29943e362e
This commit is contained in:
parent
60736807ee
commit
ef40930533
@ -225,6 +225,18 @@ swift_object_max_rsync_connections: "{{ swift_max_rsync_connections }}"
|
|||||||
swift_do_setup: True
|
swift_do_setup: True
|
||||||
swift_do_sync: True
|
swift_do_sync: True
|
||||||
|
|
||||||
|
# Example swift_container_sync_realms to specify container_sync realms
|
||||||
|
# This can exist for multiple realms (in a list)
|
||||||
|
# swift_container_sync_realms:
|
||||||
|
# - name: realm1
|
||||||
|
# # You may want to put swift_realm_keyx in user_secrets.yml or ansible-vault
|
||||||
|
# # Otherwise specify it manually below.
|
||||||
|
# key1: {{ swift_realm_key1 }}
|
||||||
|
# # key2 is optional and used for rotating/deprecated keys
|
||||||
|
# key2: {{ swift_realm_key2 }}
|
||||||
|
# clustername1: https://<cluster1-ip>/v1
|
||||||
|
# clustername2: https://<cluster2-ip>/v1
|
||||||
|
|
||||||
# swift packages that must be installed before anything else
|
# swift packages that must be installed before anything else
|
||||||
swift_requires_pip_packages:
|
swift_requires_pip_packages:
|
||||||
- virtualenv
|
- virtualenv
|
||||||
@ -292,6 +304,7 @@ swift_account_server_replicator_conf_overrides: {}
|
|||||||
swift_container_server_conf_overrides: {}
|
swift_container_server_conf_overrides: {}
|
||||||
swift_container_reconciler_conf_overrides: {}
|
swift_container_reconciler_conf_overrides: {}
|
||||||
swift_container_server_replicator_conf_overrides: {}
|
swift_container_server_replicator_conf_overrides: {}
|
||||||
|
swift_container_sync_realms_conf_overrides: {}
|
||||||
swift_drive_audit_conf_overrides: {}
|
swift_drive_audit_conf_overrides: {}
|
||||||
swift_object_server_conf_overrides: {}
|
swift_object_server_conf_overrides: {}
|
||||||
swift_object_expirer_conf_overrides: {}
|
swift_object_expirer_conf_overrides: {}
|
||||||
|
@ -32,3 +32,17 @@
|
|||||||
config_overrides: "{{ swift_proxy_server_conf_overrides }}"
|
config_overrides: "{{ swift_proxy_server_conf_overrides }}"
|
||||||
config_type: "ini"
|
config_type: "ini"
|
||||||
notify: Restart swift proxy services
|
notify: Restart swift proxy services
|
||||||
|
|
||||||
|
# If we've specified a container-sync realm use container-sync-realms.conf
|
||||||
|
- name: "Swift container-sync configuration"
|
||||||
|
config_template:
|
||||||
|
src: "container-sync-realms.conf.j2"
|
||||||
|
dest: "/etc/swift/container-sync-realms.conf"
|
||||||
|
owner: "{{ swift_system_user_name }}"
|
||||||
|
group: "{{ swift_system_group_name }}"
|
||||||
|
mode: "0644"
|
||||||
|
config_overrides: "{{ swift_container_sync_realms_conf_overrides }}"
|
||||||
|
config_type: "ini"
|
||||||
|
when: >
|
||||||
|
swift_container_sync_realms is defined
|
||||||
|
notify: Restart swift proxy services
|
||||||
|
@ -117,6 +117,20 @@
|
|||||||
config_type: "ini"
|
config_type: "ini"
|
||||||
notify: Restart swift container services
|
notify: Restart swift container services
|
||||||
|
|
||||||
|
# If we've specified a container-sync realm use container-sync-realms.conf
|
||||||
|
- name: "Swift container-sync configuration"
|
||||||
|
config_template:
|
||||||
|
src: "container-sync-realms.conf.j2"
|
||||||
|
dest: "/etc/swift/container-sync-realms.conf"
|
||||||
|
owner: "{{ swift_system_user_name }}"
|
||||||
|
group: "{{ swift_system_group_name }}"
|
||||||
|
mode: "0644"
|
||||||
|
config_overrides: "{{ swift_container_sync_realms_conf_overrides }}"
|
||||||
|
config_type: "ini"
|
||||||
|
when: >
|
||||||
|
swift_container_sync_realms is defined
|
||||||
|
notify: Restart swift container services
|
||||||
|
|
||||||
# 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:
|
config_template:
|
||||||
|
12
templates/container-sync-realms.conf.j2
Normal file
12
templates/container-sync-realms.conf.j2
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
|
{% for realm in swift_container_sync_realms %}
|
||||||
|
[{{ realm.name }}]
|
||||||
|
key = {{ realm.key1 }}
|
||||||
|
{% if realm.key2 is defined %}
|
||||||
|
key2 = {{ realm.key2 }}
|
||||||
|
{% endif %}
|
||||||
|
cluster_clustername1 = {{ realm.clustername1 }}
|
||||||
|
cluster_clustername2 = {{ realm.clustername2 }}
|
||||||
|
|
||||||
|
{% endfor %}
|
Loading…
x
Reference in New Issue
Block a user