From 78983699bbe6ec8af258a914fc980ffe20847476 Mon Sep 17 00:00:00 2001 From: Rodion Tikunov Date: Tue, 4 Oct 2016 17:32:16 +0300 Subject: [PATCH] Fix urls for radosgw s3 endpoint Some urls for radosgw s3 endpoints misses their values. Change them according to swift/keystone.pp. Change-Id: Iabe4c8111f85e4cbf4e085976ab6f572bc153112 Closes-Bug: #1604879 --- .../puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp b/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp index a66395651e..85835b9dd1 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp @@ -20,8 +20,7 @@ if $storage_hash['objects_ceph'] { $admin_url = "http://${admin_address}:8080/swift/v1" $public_url_s3 = "${public_protocol}://${public_address}:8080" - $internal_url_s3 = "${internal_protocol}://${internal_address}:8080" - $admin_url_s3 = "${admin_protocol}://${admin_address}:8080" + $admin_url_s3 = "http://${admin_address}:8080" $haproxy_stats_url = "http://${service_endpoint}:10000/;csv" @@ -65,6 +64,6 @@ if $storage_hash['objects_ceph'] { region => $region, public_url => $public_url_s3, admin_url => $admin_url_s3, - internal_url => $internal_url_s3, + internal_url => $admin_url_s3, } }