summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 02:10:26 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 02:10:26 +0000
commitbd89e21fe86d81b91ca4e963e8f47bcb7b92a208 (patch)
tree67804dfc72d1686119790b3505fbd76f42ea6135
parentfeeff5e8d38bdf10a5a919522d47d9fb0ced96b8 (diff)
parente56d9d1f14455922bf5999a69d6c5575961b6845 (diff)
Merge "Clean up TLS-related bits from swift-proxy"
-rw-r--r--manifests/profile/base/swift/proxy.pp17
-rw-r--r--spec/classes/tripleo_profile_base_swift_proxy_spec.rb5
2 files changed, 8 insertions, 14 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 3c1734b..e80c8c9 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -83,7 +83,7 @@
# [*tls_proxy_bind_ip*]
# IP on which the TLS proxy will listen on. Required only if
# enable_internal_tls is set.
-# Defaults to hiera('swift::proxy::proxy_local_net_ip')
+# Defaults to undef
#
# [*tls_proxy_fqdn*]
# fqdn on which the tls proxy will listen on. required only used if
@@ -109,8 +109,7 @@ class tripleo::profile::base::swift::proxy (
$memcache_servers = hiera('memcached_node_ips'),
$step = hiera('step'),
$swift_proxy_network = hiera('swift_proxy_network', undef),
- # FIXME(jaosorior): This will be undef when we pass this to t-h-t
- $tls_proxy_bind_ip = hiera('swift::proxy::proxy_local_net_ip', '127.0.0.1'),
+ $tls_proxy_bind_ip = undef,
$tls_proxy_fqdn = undef,
$tls_proxy_port = 8080,
) {
@@ -123,25 +122,17 @@ class tripleo::profile::base::swift::proxy (
$tls_keyfile = $certificates_specs["httpd-${swift_proxy_network}"]['service_key']
::tripleo::tls_proxy { 'swift-proxy-api':
- # FIXME(jaosorior): This will be cleaned up in a subsequent commit.
- servername => hiera("fqdn_${swift_proxy_network}", $tls_proxy_fqdn),
+ servername => $tls_proxy_fqdn,
ip => $tls_proxy_bind_ip,
port => $tls_proxy_port,
tls_cert => $tls_certfile,
tls_key => $tls_keyfile,
notify => Class['::neutron::server'],
}
- # FIXME(jaosorior): This will be cleaned up when we pass it via t-h-t
- $proxy_bind_ip = 'localhost'
- } else {
- # FIXME(jaosorior): This will be cleaned up when we pass it via t-h-t
- $proxy_bind_ip = $tls_proxy_bind_ip
}
$swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
include ::swift::config
- class { '::swift::proxy' :
- proxy_local_net_ip => $proxy_bind_ip,
- }
+ include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck
class { '::swift::proxy::cache':
diff --git a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
index 3c0ad91..68d7dde 100644
--- a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
@@ -27,7 +27,10 @@ describe 'tripleo::profile::base::swift::proxy' do
"class { '::swift':
swift_hash_path_prefix => 'foo',
}
- include ::memcached"
+ include ::memcached
+ class { '::swift::proxy':
+ proxy_local_net_ip => '127.0.0.1',
+ }"
end
context 'with ipv4 memcache servers' do