Align stars to fix CI for stable/newton
In Newton we are using Puppet < 4.0.0, some modules [1] require a higher version in latest releases. Also, cherry-pick https://review.openstack.org/453793 fixes to stable/newton. [1] concat, rabbitmq Change-Id: I41a6435126f082cac2a020276b45e45796d275c7
This commit is contained in:
parent
2d6ad77245
commit
132fa56f75
@ -94,7 +94,7 @@ mod 'certmonger',
|
||||
|
||||
mod 'concat',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-concat',
|
||||
:ref => 'master'
|
||||
:ref => '2.2.1'
|
||||
|
||||
mod 'firewall',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-firewall',
|
||||
@ -122,7 +122,7 @@ mod 'nssdb',
|
||||
|
||||
mod 'rabbitmq',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq',
|
||||
:ref => 'master'
|
||||
:ref => '03b859292fe94dd727bd4b5b795b658beb2bdb4a'
|
||||
|
||||
mod 'redis',
|
||||
:git => 'https://github.com/arioch/puppet-redis',
|
||||
@ -154,5 +154,5 @@ mod 'vcsrepo',
|
||||
|
||||
mod 'xinetd',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd',
|
||||
:ref => 'master'
|
||||
:ref => '9beb441c0c5433f6a1a42dd70aea173de5b800e4'
|
||||
|
||||
|
@ -562,17 +562,6 @@ def create_compute_manifest(config, messages):
|
||||
else:
|
||||
config["CONFIG_VNCPROXY_PROTOCOL"] = "http"
|
||||
|
||||
migrate_protocol = config['CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL']
|
||||
if migrate_protocol == 'ssh':
|
||||
config['CONFIG_NOVA_COMPUTE_MIGRATE_URL'] = (
|
||||
'qemu+ssh://nova@%s/system?no_verify=1&'
|
||||
'keyfile=/etc/nova/ssh/nova_migration_key'
|
||||
)
|
||||
else:
|
||||
config['CONFIG_NOVA_COMPUTE_MIGRATE_URL'] = (
|
||||
'qemu+tcp://nova@%s/system'
|
||||
)
|
||||
|
||||
ssh_keys_details = {}
|
||||
for host in compute_hosts:
|
||||
try:
|
||||
|
@ -29,8 +29,6 @@ class packstack::nova::compute ()
|
||||
nova_config{
|
||||
'DEFAULT/volume_api_class':
|
||||
value => 'nova.volume.cinder.API';
|
||||
'libvirt/live_migration_uri':
|
||||
value => hiera('CONFIG_NOVA_COMPUTE_MIGRATE_URL');
|
||||
}
|
||||
|
||||
if ($::fqdn == '' or $::fqdn =~ /localhost/) {
|
||||
|
@ -27,6 +27,23 @@ class packstack::nova::compute::libvirt ()
|
||||
Service <| title == 'libvirt' |>
|
||||
}
|
||||
|
||||
$migrate_transport = hiera('CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL')
|
||||
if $migrate_transport == 'ssh' {
|
||||
$client_extraparams = {
|
||||
no_verify => 1,
|
||||
keyfile => '/etc/nova/ssh/nova_migration_key',
|
||||
}
|
||||
} else {
|
||||
$client_extraparams = {}
|
||||
}
|
||||
|
||||
class { '::nova::migration::libvirt':
|
||||
transport => $migrate_transport,
|
||||
client_user => 'nova',
|
||||
client_extraparams => $client_extraparams,
|
||||
require => Class['::nova::compute::libvirt']
|
||||
}
|
||||
|
||||
class { '::nova::compute::libvirt':
|
||||
libvirt_virt_type => $libvirt_virt_type,
|
||||
vncserver_listen => $libvirt_vnc_bind_host,
|
||||
|
Loading…
Reference in New Issue
Block a user