From ba28ffd4487591a70da268d39aa91909ce8fb8e2 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Tue, 27 Sep 2016 10:00:39 +0100 Subject: [PATCH] Fix variable for replicator config options The config_options should be a variable and not a string, this was an oversight in the move to simplify the replication configuration options. Change-Id: I2e914ef4acee02442e9e44e180290a7346f256a7 --- tasks/swift_storage_hosts_account.yml | 8 ++++---- tasks/swift_storage_hosts_container.yml | 8 ++++---- tasks/swift_storage_hosts_object.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tasks/swift_storage_hosts_account.yml b/tasks/swift_storage_hosts_account.yml index 56ca492f..586776ee 100644 --- a/tasks/swift_storage_hosts_account.yml +++ b/tasks/swift_storage_hosts_account.yml @@ -19,8 +19,8 @@ vars: program_name: "swift-account-replicator" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_account_replicator_program_config_options', - 'swift_account_server_program_config_options') }}" + swift_account_replicator_program_config_options, + swift_account_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}" @@ -54,8 +54,8 @@ vars: program_name: "swift-account-auditor" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_account_replicator_program_config_options', - 'swift_account_server_program_config_options') }}" + swift_account_replicator_program_config_options, + swift_account_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}" diff --git a/tasks/swift_storage_hosts_container.yml b/tasks/swift_storage_hosts_container.yml index 3a45cb83..6727f4e8 100644 --- a/tasks/swift_storage_hosts_container.yml +++ b/tasks/swift_storage_hosts_container.yml @@ -19,8 +19,8 @@ vars: program_name: "swift-container-replicator" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_container_replicator_program_config_options', - 'swift_container_server_program_config_options') }}" + swift_container_replicator_program_config_options, + swift_container_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}" @@ -54,8 +54,8 @@ vars: program_name: "swift-container-auditor" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_container_replicator_program_config_options', - 'swift_container_server_program_config_options') }}" + swift_container_replicator_program_config_options, + swift_container_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}" diff --git a/tasks/swift_storage_hosts_object.yml b/tasks/swift_storage_hosts_object.yml index 9050ddc4..10bc02ff 100644 --- a/tasks/swift_storage_hosts_object.yml +++ b/tasks/swift_storage_hosts_object.yml @@ -19,8 +19,8 @@ vars: program_name: "swift-object-replicator" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_object_replicator_program_config_options', - 'swift_object_server_program_config_options') }}" + swift_object_replicator_program_config_options, + swift_object_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}" @@ -54,8 +54,8 @@ vars: program_name: "swift-object-auditor" program_config_options: "{{ swift_dedicated_replication | ternary( - 'swift_object_replicator_program_config_options', - 'swift_object_server_program_config_options') }}" + swift_object_replicator_program_config_options, + swift_object_server_program_config_options) }}" service_name: "{{ swift_service_name }}" system_user: "{{ swift_system_user_name }}" system_group: "{{ swift_system_group_name }}"