Merge "Enable computes at end of deploy for VMWare"

deployment/puppet/osnailyfacter/modular/astute/tasks.yaml

@@ -54,7 +54,7 @@
   type: shell
   version: 2.0.0
   role: [primary-controller, compute-vmware]
-  requires: [post_deployment_start]
+  requires: [post_deployment_start, enable_nova_compute_service]
   required_for: [post_deployment_end]
   condition: "settings:common.use_vcenter.value == true"
   parameters:
@@ -64,7 +64,7 @@
 - id: enable_nova_compute_service
   type: puppet
   version: 2.0.0
-  role: [compute]
+  role: [compute, compute-vmware]
   requires: [post_deployment_start]
   required_for: [post_deployment_end]
   refresh_on: [nova_config, nova_paste_api_ini]

deployment/puppet/vmware/manifests/ceilometer/compute_vmware.pp

@@ -4,7 +4,7 @@
 #
 # It does the following:
 # - configure keystone auth parameters
-# - reload ceilometer compute agent service, package is already
+# - reload ceilometer polling agent service, package is already
 #   installed by ceilometer-compute deployment task
 #
 # === Parameters
@@ -72,10 +72,10 @@ class vmware::ceilometer::compute_vmware(
 
   include ceilometer::params
 
-  service { 'ceilometer-agent-compute':
+  service { 'ceilometer-polling':
     ensure => running,
-    name   => $::ceilometer::params::agent_compute_service_name,
+    name   => $::ceilometer::params::agent_polling_service_name,
   }
 
-  Ceilometer_config<| |> ~> Service['ceilometer-agent-compute']
+  Ceilometer_config<| |> ~> Service['ceilometer-polling']
 }

deployment/puppet/vmware/manifests/compute_vmware.pp

@@ -1,5 +1,6 @@
 #    Copyright 2015 Mirantis, Inc.
 
+# FIXME(mattymo): Use standard class documentation format
 # vmware::compute_vmware resource deploys nova-compute service and configures it for use
 # with vmwareapi.VCDriver (vCenter server as hypervisor).  Depends on nova::params class.
 
@@ -17,6 +18,7 @@
 # datastore_regex        - regex that specifies vCenter datastores to use
 # api_retry_count        - number of tries on failures
 # use_quantum            - shows if neutron is enabled
+# service_enabled        - manage nova-compute service (Default: false)
 
 define vmware::compute_vmware(
   $availability_zone_name,
@@ -34,7 +36,8 @@ define vmware::compute_vmware(
   $nova_compute_conf  = '/etc/nova/nova-compute.conf',
   $task_poll_interval = 5.0,
   $use_linked_clone   = true,
-  $wsdl_location      = undef
+  $wsdl_location      = undef,
+  $service_enabled    = false,
 )
 {
   include nova::params
@@ -63,7 +66,7 @@ define vmware::compute_vmware(
     service { 'nova-compute':
       ensure => running,
       name   => $::nova::params::compute_service_name,
-      enable => true,
+      enable => $service_enabled,
     }
 
     Package['python-oslo.vmware']->

deployment/puppet/vmware/spec/classes/ceilometer_spec.rb

@@ -3,14 +3,9 @@ require 'spec_helper'
 describe 'vmware::ceilometer' do
   let(:facts) { { :osfamily => 'debian' } }
 
-  # We are using ceilometer::agent::compute which inherits
-  # ceilometer class. In ceilometer ceilometer::agent::compute class
-  # parameter metering_secret isn't set, so default value 'false' will be used.
-  # It's boolean value, not string, so test validate_string($metering_secret)
-  # will fail in ceilometer class.
-  it 'must disable ceilometer-agent-compute' do
-    should contain_class('ceilometer::agent::compute').with({
-      'enabled' => 'false'
+  it 'should enable ceilometer-polling' do
+    should contain_service('ceilometer-polling').with({
+      'enabled' => 'true'
     })
   end