From e089cc6fbbd89c83bb6e4ba86295702f50d0f4a3 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 25 Jan 2017 19:47:19 +0200
Subject: Clean TLS proxy-related setup for neutron-server profile

Since the commit this depends on sets it up via hieradata, the
conditionals here are no longer needed.

bp tls-via-certmonger
Depends-On: I9252512dbf9cf2e3eec50c41bf10629d36070bbd

Change-Id: I37275e42763e103b81878b6af07c750a524c5697
---
 manifests/profile/base/neutron.pp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'manifests/profile/base/neutron.pp')

diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 3de50c2..e6a32db 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -35,22 +35,9 @@ 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
-- 
cgit 1.2.3-korg