Merge branch 'guessi/fix_package_install'

Closes #140
puppetlabs-toy-chest · Apr 6, 2015 · c7d77de · c7d77de
2 parents d402f62 + 8362923
commit c7d77de
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 41 deletions.
diff --git a/manifests/common/ceilometer.pp b/manifests/common/ceilometer.pp
@@ -24,10 +24,12 @@
     rabbit_password => $::openstack::config::rabbitmq_password,
   }
 
-  class { '::ceilometer::api':
-    enabled           => $is_controller,
-    keystone_host     => $controller_management_address,
-    keystone_password => $::openstack::config::ceilometer_password,
+  if $is_controller {
+    class { '::ceilometer::api':
+      enabled           => $is_controller,
+      keystone_host     => $controller_management_address,
+      keystone_password => $::openstack::config::ceilometer_password,
+    }
   }
 
   class { '::ceilometer::db':

diff --git a/manifests/common/glance.pp b/manifests/common/glance.pp
@@ -4,17 +4,19 @@
 # set so that services like Tempest can access credentials
 # on the controller
 class openstack::common::glance {
-  class { '::glance::api':
-    keystone_password   => $::openstack::config::glance_password,
-    auth_host           => $::openstack::config::controller_address_management,
-    keystone_tenant     => 'services',
-    keystone_user       => 'glance',
-    database_connection => $::openstack::resources::connectors::glance,
-    registry_host       => $::openstack::config::storage_address_management,
-    verbose             => $::openstack::config::verbose,
-    debug               => $::openstack::config::debug,
-    enabled             => $::openstack::profile::base::is_storage,
-    mysql_module        => '2.2',
-    os_region_name      => $::openstack::region,
+  if $::openstack::profile::base::is_storage {
+    class { '::glance::api':
+      keystone_password   => $::openstack::config::glance_password,
+      auth_host           => $::openstack::config::controller_address_management,
+      keystone_tenant     => 'services',
+      keystone_user       => 'glance',
+      database_connection => $::openstack::resources::connectors::glance,
+      registry_host       => $::openstack::config::storage_address_management,
+      verbose             => $::openstack::config::verbose,
+      debug               => $::openstack::config::debug,
+      enabled             => $::openstack::profile::base::is_storage,
+      mysql_module        => '2.2',
+      os_region_name      => $::openstack::region,
+    }
   }
 }
diff --git a/manifests/common/neutron.pp b/manifests/common/neutron.pp
@@ -4,6 +4,8 @@
 # Flags install individual services as needed
 # This follows the suggest deployment from the neutron Administrator Guide.
 class openstack::common::neutron {
+  $is_controller = $::openstack::profile::base::is_controller
+
   $controller_management_address = $::openstack::config::controller_address_management
 
   $data_network = $::openstack::config::network_data
@@ -36,16 +38,19 @@
     auth_host           => $::openstack::config::controller_address_management,
     auth_password       => $::openstack::config::neutron_password,
     database_connection => $::openstack::resources::connectors::neutron,
-    enabled             => $::openstack::profile::base::is_controller,
-    sync_db             => $::openstack::profile::base::is_controller,
+    package_ensure      => $is_controller,
+    enabled             => $is_controller,
+    sync_db             => $is_controller,
     mysql_module        => '2.2',
   }
 
-  class { '::neutron::server::notifications':
-    nova_url            => "http://${controller_management_address}:8774/v2/",
-    nova_admin_auth_url => "http://${controller_management_address}:35357/v2.0/",
-    nova_admin_password => $::openstack::config::nova_password,
-    nova_region_name    => $::openstack::config::region,
+  if $is_controller {
+    class { '::neutron::server::notifications':
+      nova_url            => "http://${controller_management_address}:8774/v2/",
+      nova_admin_auth_url => "http://${controller_management_address}:35357/v2.0/",
+      nova_admin_password => $::openstack::config::nova_password,
+      nova_region_name    => $::openstack::config::region,
+    }
   }
 
   if $::osfamily == 'redhat' {

diff --git a/manifests/common/nova.pp b/manifests/common/nova.pp
@@ -26,26 +26,28 @@
 
   nova_config { 'DEFAULT/default_floating_pool': value => 'public' }
 
-  class { '::nova::api':
-    admin_password                       => $::openstack::config::nova_password,
-    auth_host                            => $controller_management_address,
-    enabled                              => $is_controller,
-    neutron_metadata_proxy_shared_secret => $::openstack::config::neutron_shared_secret,
-  }
+  if $is_controller {
+    class { '::nova::api':
+      admin_password                       => $::openstack::config::nova_password,
+      auth_host                            => $controller_management_address,
+      enabled                              => $is_controller,
+      neutron_metadata_proxy_shared_secret => $::openstack::config::neutron_shared_secret,
+    }
 
-  class { '::nova::vncproxy':
-    host    => $::openstack::config::controller_address_api,
-    enabled => $is_controller,
-  }
+    class { '::nova::vncproxy':
+      host    => $::openstack::config::controller_address_api,
+      enabled => $is_controller,
+    }
 
-  class { [
-    'nova::scheduler',
-    'nova::objectstore',
-    'nova::cert',
-    'nova::consoleauth',
-    'nova::conductor'
-  ]:
-    enabled => $is_controller,
+    class { [
+      'nova::scheduler',
+      'nova::objectstore',
+      'nova::cert',
+      'nova::consoleauth',
+      'nova::conductor'
+    ]:
+      enabled => $is_controller,
+    }
   }
 
   # TODO: it's important to set up the vnc properly