Further edits

manifests/controller.pp

@@ -54,6 +54,7 @@ class openstack::controller (
   $auto_assign_floating_ip = false,
   $network_config          = {},
   # Database
+  $db_host                 = '127.0.0.1',
   $db_type                 = 'mysql',
   $mysql_account_security  = true,
   $mysql_bind_address      = '0.0.0.0',
@@ -116,7 +117,7 @@ class openstack::controller (
   class { 'openstack::keystone':
     verbose                   => $verbose,
     db_type                   => $db_type,
-    db_host                   => '127.0.0.1',
+    db_host                   => $db_host,
     keystone_db_password      => $keystone_db_password,
     keystone_db_dbname        => $keystone_db_dbname,
     keystone_db_user          => $keystone_db_user,
@@ -136,7 +137,7 @@ class openstack::controller (
   class { 'openstack::glance':
     verbose                   => $verbose,
     db_type                   => $db_type,
-    db_host                   => '127.0.0.1',
+    db_host                   => $db_host,
     glance_db_user            => $glance_db_user,
     glance_db_dbname          => $glance_db_dbname,
     glance_db_password        => $glance_db_password,
@@ -157,7 +158,7 @@ class openstack::controller (
 
   class { 'openstack::nova::controller':
     # Database
-    db_host                 => '127.0.0.1',
+    db_host                 => $db_host,
     # Network
     network_manager         => $network_manager,
     network_config          => $network_config,

manifests/nova/compute.pp

@@ -49,7 +49,7 @@ class openstack::nova::compute (
   $vnc_enabled                   = true,
   $vncproxy_host                 = undef,
   # General
-  $verbose                       = false,
+  $verbose                       = 'False',
   $exported_resources            = true,
   $enabled                       = true
 ) {

manifests/nova/controller.pp

@@ -20,6 +20,15 @@
 #
 
 class openstack::nova::controller (
+  # Network Required
+  $public_address,
+  # Database Required
+  $db_host,
+  # Rabbit Required
+  $rabbit_password,
+  # Nova Required
+  $nova_user_password,
+  $nova_db_password,
   # Network
   $network_manager           = 'nova.network.manager.FlatDHCPManager',
   $network_config            = {},
@@ -27,8 +36,8 @@ class openstack::nova::controller (
   $private_interface         = 'eth1',
   $fixed_range               = '10.0.0.0/24',
   $floating_range            = false,
-  $admin_address             = undef,
+  $internal_address          = $public_address,
-  $internal_address          = undef,
+  $admin_address             = $public_address,
   $auto_assign_floating_ip   = false,
   $create_networks           = true,
   $num_networks              = 1,
@@ -45,34 +54,11 @@ class openstack::nova::controller (
   # VNC
   $vnc_enabled               = true,
   # General
-  $verbose                   = false,
+  $verbose                   = 'False',
   $enabled                   = true,
-  $exported_resources        = true,
+  $exported_resources        = true
-  # Network Required
-  $public_address,
-  # Database Required
-  $db_host,
-  # Rabbit Required
-  $rabbit_password,
-  # Nova Required
-  $nova_user_password,
-  $nova_db_password,
-
 ) {
 
-  # Configure admin_address and internal address if needed.
-  if (admin_address == undef) {
-    $real_admin_address = $public_address
-  } else {
-    $real_admin_address = $admin_address
-  }
-
-  if (internal_address == undef) {
-    $real_internal_address = $public_address
-  } else {
-    $real_internal_address = $internal_address
-  }
-
   # Configure the db string
   case $db_type {
     'mysql': {
@@ -85,7 +71,7 @@ class openstack::nova::controller (
   } else {
     $real_glance_api_servers = $glance_api_servers
   }
-  if ($export_resources) {
+  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' |>
@@ -96,8 +82,6 @@ class openstack::nova::controller (
     @@nova_config { 'glance_api_servers': value => $real_glance_api_servers }
     Nova_config <| title == 'glance_api_servers' |>
 
-    @@nova_config { 'novncproxy_base_url': value => "http://${public_address}:6080/vnc_auto.html" }
-
     $sql_connection    = false
     $glance_connection = false
     $rabbit_connection = false