From 746330cc858ad2c419571e56248f6ee82280a3da Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Mon, 27 Nov 2017 15:25:35 +0000 Subject: [PATCH] Define swift_proxy_port for trove Trove needs to access swift_proxy_port, which was currently only defined in swift_all, and therefore undefined for trove. Change-Id: I9bf893f1f047ea1896a64da12909faeac2c1c126 --- group_vars/swift_all.yml | 2 +- group_vars/trove_all.yml | 2 ++ host_vars/localhost/swift.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/group_vars/swift_all.yml b/group_vars/swift_all.yml index 8e86a5bf78..947a4e9342 100644 --- a/group_vars/swift_all.yml +++ b/group_vars/swift_all.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -swift_proxy_port: 8080 +swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}" swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}" swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}" swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}" diff --git a/group_vars/trove_all.yml b/group_vars/trove_all.yml index 35a4a41dcc..d90b4647ee 100644 --- a/group_vars/trove_all.yml +++ b/group_vars/trove_all.yml @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}" + trove_service_region: "{{ service_region }}" trove_galera_user: trove trove_galera_database_name: trove_service diff --git a/host_vars/localhost/swift.yml b/host_vars/localhost/swift.yml index 50ca2aff1b..6dfd6dc6a6 100644 --- a/host_vars/localhost/swift.yml +++ b/host_vars/localhost/swift.yml @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +swift_proxy_port: 8080 swift_system_user_name: swift swift_system_shell: /bin/bash swift_system_comment: swift system user