From ea22f02ab3b1cd9b6141d01221137c1d00d86e10 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Wed, 24 Oct 2012 11:18:04 -0700
Subject: [PATCH] stop exporting resources.

This commit removes embedded logic that was
exporting resources. Service discovery should be
performed from the site manifest using query
against puppet db.
---
 manifests/compute.pp         |  8 ++------
 manifests/controller.pp      |  3 ---
 manifests/nova/controller.pp | 22 +++-------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index 382254e..d7e65a4 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -23,7 +23,7 @@ class openstack::compute (
   # Required Rabbit
   $rabbit_password,
   # DB
-  $sql_connection                = false,
+  $sql_connection,
   # Network
   $quantum                       = true,
   $public_address                = $internal_address,
@@ -37,7 +37,7 @@ class openstack::compute (
   # Nova
   $purge_nova_config              = true,
   # Rabbit
-  $rabbit_host                   = false,
+  $rabbit_host                   = '127.0.0.1',
   $rabbit_user                   = 'nova',
   # Glance
   $glance_api_servers            = false,
@@ -70,10 +70,6 @@ class openstack::compute (
     }
   }
 
-  $final_sql_connection = $sql_connection
-  $glance_connection = $glance_api_servers
-  $rabbit_connection = $rabbit_host
-
   class { 'nova':
     sql_connection     => $sql_connection,
     rabbit_userid      => $rabbit_user,
diff --git a/manifests/controller.pp b/manifests/controller.pp
index 8391bef..980a2a1 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -31,7 +31,6 @@
 # [network_config] Hash that can be used to pass implementation specifc
 #   network settings. Optioal. Defaults to {}
 # [verbose] Whether to log services at verbose.
-# [export_resources] Rather to export resources.
 # Horizon related config - assumes puppetlabs-horizon code
 # [secret_key]          secret key to encode cookies, …
 # [cache_server_ip]     local memcached instance ip
@@ -125,7 +124,6 @@ class openstack::controller (
   $horizon_app_links       = undef,
   # General
   $verbose                 = 'False',
-  $export_resources        = true,
   # if the cinder management components should be installed
   $cinder                  = false,
   $cinder_user_password    = 'cinder_user_pass',
@@ -257,7 +255,6 @@ class openstack::controller (
     # General
     verbose                 => $verbose,
     enabled                 => $enabled,
-    exported_resources      => $export_resources,
   }
 
   ######### Cinder Controller Services ########
diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp
index 8288459..873bdce 100644
--- a/manifests/nova/controller.pp
+++ b/manifests/nova/controller.pp
@@ -58,7 +58,6 @@ class openstack::nova::controller (
   $keystone_host             = '127.0.0.1',
   $verbose                   = 'False',
   $enabled                   = true,
-  $exported_resources        = true
 ) {
 
   # Configure the db string
@@ -73,25 +72,10 @@ class openstack::nova::controller (
   } else {
     $real_glance_api_servers = $glance_api_servers
   }
-  if ($exported_resources) {
-    # export all of the things that will be needed by the clients
-    @@nova_config { 'rabbit_host': value => $internal_address }
-    Nova_config <| title == 'rabbit_host' |>
 
-    @@nova_config { 'sql_connection': value => $nova_db }
-    Nova_config <| title == 'sql_connection' |>
-
-    @@nova_config { 'glance_api_servers': value => $real_glance_api_servers }
-    Nova_config <| title == 'glance_api_servers' |>
-
-    $sql_connection    = false
-    $glance_connection = false
-    $rabbit_connection = false
-  } else {
-    $sql_connection    = $nova_db
-    $glance_connection = $real_glance_api_servers
-    $rabbit_connection = $internal_address
-  }
+  $sql_connection    = $nova_db
+  $glance_connection = $real_glance_api_servers
+  $rabbit_connection = $internal_address
 
   # Install / configure rabbitmq
   class { 'nova::rabbitmq':