Merge "Fix variable for replicator config options"

This commit is contained in:
Jenkins 2016-09-27 11:42:05 +00:00 committed by Gerrit Code Review
commit 6c1038c001
3 changed files with 12 additions and 12 deletions

View File

@ -19,8 +19,8 @@
vars: vars:
program_name: "swift-account-replicator" program_name: "swift-account-replicator"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_account_replicator_program_config_options', swift_account_replicator_program_config_options,
'swift_account_server_program_config_options') }}" swift_account_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"
@ -54,8 +54,8 @@
vars: vars:
program_name: "swift-account-auditor" program_name: "swift-account-auditor"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_account_replicator_program_config_options', swift_account_replicator_program_config_options,
'swift_account_server_program_config_options') }}" swift_account_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"

View File

@ -19,8 +19,8 @@
vars: vars:
program_name: "swift-container-replicator" program_name: "swift-container-replicator"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_container_replicator_program_config_options', swift_container_replicator_program_config_options,
'swift_container_server_program_config_options') }}" swift_container_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"
@ -54,8 +54,8 @@
vars: vars:
program_name: "swift-container-auditor" program_name: "swift-container-auditor"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_container_replicator_program_config_options', swift_container_replicator_program_config_options,
'swift_container_server_program_config_options') }}" swift_container_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"

View File

@ -19,8 +19,8 @@
vars: vars:
program_name: "swift-object-replicator" program_name: "swift-object-replicator"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_object_replicator_program_config_options', swift_object_replicator_program_config_options,
'swift_object_server_program_config_options') }}" swift_object_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"
@ -54,8 +54,8 @@
vars: vars:
program_name: "swift-object-auditor" program_name: "swift-object-auditor"
program_config_options: "{{ swift_dedicated_replication | ternary( program_config_options: "{{ swift_dedicated_replication | ternary(
'swift_object_replicator_program_config_options', swift_object_replicator_program_config_options,
'swift_object_server_program_config_options') }}" swift_object_server_program_config_options) }}"
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
system_user: "{{ swift_system_user_name }}" system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}" system_group: "{{ swift_system_group_name }}"