diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-27 01:07:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-27 01:07:11 +0000 |
commit | d427c2a326194c1612844d1509b8f1216ac98cf6 (patch) | |
tree | 41e1128ae488c9054e3246ebaa50469cdf9efa5d /manifests/profile/base/neutron.pp | |
parent | 4d356ed4ae5e609bf4ffc9a1729690e0b0c6df22 (diff) | |
parent | 033e1f360025c9409d7e840b48a64c8814c3a1bd (diff) |
Merge "Use TLS proxy for neutron server's internal TLS"
Diffstat (limited to 'manifests/profile/base/neutron.pp')
-rw-r--r-- | manifests/profile/base/neutron.pp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index e6a32db..3de50c2 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -35,9 +35,22 @@ class tripleo::profile::base::neutron ( $rabbit_hosts = hiera('rabbitmq_node_names', undef), $rabbit_port = hiera('neutron::rabbit_port', 5672), ) { + + # TODO(jaosorior): Remove this when we pass it via t-h-t + if hiera('enable_internal_tls', false) { + $bind_host = 'localhost' + } else { + # This is executed in all of the nodes that use something neutron-related, + # so we set the defalut, since the bind_host is only available in the + # controllers. Either way, this will be removed and set properly via t-h-t + # in a subsequent commit. + $bind_host = hiera('neutron::bind_host', $::os_service_default) + } + if $step >= 3 { $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}") class { '::neutron' : + bind_host => $bind_host, rabbit_hosts => $rabbit_endpoints, } include ::neutron::config |