Fix noop tests for new fixtures
This patch makes it possible to enable new fixtures for I9e6363e20c59fd023a64be1013fa2697e80fdbcc -Added the compute-vmware role in globals and hiera tasks for noop script -Fix compute-vmware running service, this service started with enable_compute -Fix noop tests Change-Id: Ibaf3a0bbbfb1bb8308bb55de8e905ffccb57a0d6 Partial-Bug: 1541849 Related-Bug: 1535339
This commit is contained in:
parent
80a420929a
commit
7be192b72b
|
@ -2,8 +2,8 @@
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
groups: [primary-controller, controller,
|
groups: [primary-controller, controller,
|
||||||
cinder, cinder-block-device, cinder-vmware, compute, ceph-osd,
|
cinder, cinder-block-device, cinder-vmware, compute, compute-vmware,
|
||||||
primary-mongo, mongo, virt, ironic]
|
ceph-osd, primary-mongo, mongo, virt, ironic]
|
||||||
required_for: [deploy_end]
|
required_for: [deploy_end]
|
||||||
requires: [hiera]
|
requires: [hiera]
|
||||||
condition:
|
condition:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
groups: [primary-controller, controller, cinder, cinder-block-device,
|
groups: [primary-controller, controller, cinder, cinder-block-device,
|
||||||
cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
|
cinder-vmware, compute, compute-vmware, ceph-osd, primary-mongo, mongo, virt, ironic]
|
||||||
requires: [deploy_start, rsync_core_puppet]
|
requires: [deploy_start, rsync_core_puppet]
|
||||||
required_for: [setup_repositories]
|
required_for: [setup_repositories]
|
||||||
condition:
|
condition:
|
||||||
|
|
|
@ -40,7 +40,13 @@ define vmware::compute_vmware(
|
||||||
$service_enabled = false,
|
$service_enabled = false,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
include nova::params
|
include ::nova::params
|
||||||
|
|
||||||
|
if $service_enabled {
|
||||||
|
$service_ensure = 'running'
|
||||||
|
} else {
|
||||||
|
$service_ensure = 'stopped'
|
||||||
|
}
|
||||||
|
|
||||||
# We skip deployment if current node name is not same as target_node
|
# We skip deployment if current node name is not same as target_node
|
||||||
if ($target_node == $current_node) {
|
if ($target_node == $current_node) {
|
||||||
|
@ -64,7 +70,7 @@ define vmware::compute_vmware(
|
||||||
}
|
}
|
||||||
|
|
||||||
service { 'nova-compute':
|
service { 'nova-compute':
|
||||||
ensure => running,
|
ensure => $service_ensure,
|
||||||
name => $::nova::params::compute_service_name,
|
name => $::nova::params::compute_service_name,
|
||||||
enable => $service_enabled,
|
enable => $service_enabled,
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
# ROLE: ironic
|
# ROLE: ironic
|
||||||
# ROLE: controller
|
# ROLE: controller
|
||||||
# ROLE: compute
|
# ROLE: compute
|
||||||
|
# ROLE: compute-vmware
|
||||||
# ROLE: cinder-vmware
|
# ROLE: cinder-vmware
|
||||||
# ROLE: cinder-block-device
|
# ROLE: cinder-block-device
|
||||||
# ROLE: cinder
|
# ROLE: cinder
|
||||||
|
|
|
@ -28,6 +28,7 @@ describe manifest do
|
||||||
cinder_db_user = Noop.hiera_structure 'cinder/db_user', 'cinder'
|
cinder_db_user = Noop.hiera_structure 'cinder/db_user', 'cinder'
|
||||||
cinder_db_name = Noop.hiera_structure 'cinder/db_name', 'cinder'
|
cinder_db_name = Noop.hiera_structure 'cinder/db_name', 'cinder'
|
||||||
cinder = Noop.puppet_function 'roles_include', 'cinder'
|
cinder = Noop.puppet_function 'roles_include', 'cinder'
|
||||||
|
cinder_vmware = Noop.puppet_function 'roles_include', 'cinder-vmware'
|
||||||
cinder_block_device = Noop.puppet_function 'roles_include', 'cinder-block-device'
|
cinder_block_device = Noop.puppet_function 'roles_include', 'cinder-block-device'
|
||||||
hostname = Noop.hiera('fqdn')
|
hostname = Noop.hiera('fqdn')
|
||||||
|
|
||||||
|
@ -38,6 +39,8 @@ describe manifest do
|
||||||
'ceph'
|
'ceph'
|
||||||
elsif storage_hash['volumes_block_device']
|
elsif storage_hash['volumes_block_device']
|
||||||
'block'
|
'block'
|
||||||
|
elsif cinder_vmware
|
||||||
|
'vmdk'
|
||||||
else
|
else
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue