Adjust live migration config to changes in puppet-nova
https://review.openstack.org/#/c/451968 has changed live migration
configuration in puppet-nova. This patch adjust packstack to this
change.
Use ocata repos for testing in stable/ocata
Change-Id: I43e3a2171981886da5e6c779fd24510540a7c07a
(cherry picked from commit 1f69afa939
)
This commit is contained in:
parent
5a95e44147
commit
0a55810f1c
42
Puppetfile
42
Puppetfile
@ -4,87 +4,87 @@ moduledir '/usr/share/openstack-puppet/modules'
|
|||||||
|
|
||||||
mod 'aodh',
|
mod 'aodh',
|
||||||
:git => 'https://github.com/openstack/puppet-aodh',
|
:git => 'https://github.com/openstack/puppet-aodh',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'ceilometer',
|
mod 'ceilometer',
|
||||||
:git => 'https://github.com/openstack/puppet-ceilometer',
|
:git => 'https://github.com/openstack/puppet-ceilometer',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'cinder',
|
mod 'cinder',
|
||||||
:git => 'https://github.com/openstack/puppet-cinder',
|
:git => 'https://github.com/openstack/puppet-cinder',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'glance',
|
mod 'glance',
|
||||||
:git => 'https://github.com/openstack/puppet-glance',
|
:git => 'https://github.com/openstack/puppet-glance',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'gnocchi',
|
mod 'gnocchi',
|
||||||
:git => 'https://github.com/openstack/puppet-gnocchi',
|
:git => 'https://github.com/openstack/puppet-gnocchi',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'heat',
|
mod 'heat',
|
||||||
:git => 'https://github.com/openstack/puppet-heat',
|
:git => 'https://github.com/openstack/puppet-heat',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'magnum',
|
mod 'magnum',
|
||||||
:git => 'https://github.com/openstack/puppet-magnum',
|
:git => 'https://github.com/openstack/puppet-magnum',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'horizon',
|
mod 'horizon',
|
||||||
:git => 'https://github.com/openstack/puppet-horizon',
|
:git => 'https://github.com/openstack/puppet-horizon',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'ironic',
|
mod 'ironic',
|
||||||
:git => 'https://github.com/openstack/puppet-ironic',
|
:git => 'https://github.com/openstack/puppet-ironic',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'keystone',
|
mod 'keystone',
|
||||||
:git => 'https://github.com/openstack/puppet-keystone',
|
:git => 'https://github.com/openstack/puppet-keystone',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'manila',
|
mod 'manila',
|
||||||
:git => 'https://github.com/openstack/puppet-manila',
|
:git => 'https://github.com/openstack/puppet-manila',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'neutron',
|
mod 'neutron',
|
||||||
:git => 'https://github.com/openstack/puppet-neutron',
|
:git => 'https://github.com/openstack/puppet-neutron',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'nova',
|
mod 'nova',
|
||||||
:git => 'https://github.com/openstack/puppet-nova',
|
:git => 'https://github.com/openstack/puppet-nova',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'openstack_extras',
|
mod 'openstack_extras',
|
||||||
:git => 'https://github.com/openstack/puppet-openstack_extras',
|
:git => 'https://github.com/openstack/puppet-openstack_extras',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'openstacklib',
|
mod 'openstacklib',
|
||||||
:git => 'https://github.com/openstack/puppet-openstacklib',
|
:git => 'https://github.com/openstack/puppet-openstacklib',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'oslo',
|
mod 'oslo',
|
||||||
:git => 'https://github.com/openstack/puppet-oslo',
|
:git => 'https://github.com/openstack/puppet-oslo',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'sahara',
|
mod 'sahara',
|
||||||
:git => 'https://github.com/openstack/puppet-sahara',
|
:git => 'https://github.com/openstack/puppet-sahara',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'swift',
|
mod 'swift',
|
||||||
:git => 'https://github.com/openstack/puppet-swift',
|
:git => 'https://github.com/openstack/puppet-swift',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'tempest',
|
mod 'tempest',
|
||||||
:git => 'https://github.com/openstack/puppet-tempest',
|
:git => 'https://github.com/openstack/puppet-tempest',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'trove',
|
mod 'trove',
|
||||||
:git => 'https://github.com/openstack/puppet-trove',
|
:git => 'https://github.com/openstack/puppet-trove',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
mod 'vswitch',
|
mod 'vswitch',
|
||||||
:git => 'https://github.com/openstack/puppet-vswitch',
|
:git => 'https://github.com/openstack/puppet-vswitch',
|
||||||
:ref => 'master'
|
:ref => 'stable/ocata'
|
||||||
|
|
||||||
## Non-OpenStack modules
|
## Non-OpenStack modules
|
||||||
|
|
||||||
|
@ -341,17 +341,6 @@ def create_compute_manifest(config, messages):
|
|||||||
else:
|
else:
|
||||||
config["CONFIG_VNCPROXY_PROTOCOL"] = "http"
|
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'
|
|
||||||
)
|
|
||||||
|
|
||||||
config["CONFIG_NOVA_ALLOW_RESIZE_TO_SAME"] = len(compute_hosts) == 1
|
config["CONFIG_NOVA_ALLOW_RESIZE_TO_SAME"] = len(compute_hosts) == 1
|
||||||
|
|
||||||
ssh_keys_details = {}
|
ssh_keys_details = {}
|
||||||
|
@ -29,8 +29,6 @@ class packstack::nova::compute ()
|
|||||||
nova_config{
|
nova_config{
|
||||||
'DEFAULT/volume_api_class':
|
'DEFAULT/volume_api_class':
|
||||||
value => 'nova.volume.cinder.API';
|
value => 'nova.volume.cinder.API';
|
||||||
'libvirt/live_migration_uri':
|
|
||||||
value => hiera('CONFIG_NOVA_COMPUTE_MIGRATE_URL');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($::fqdn == '' or $::fqdn =~ /localhost/) {
|
if ($::fqdn == '' or $::fqdn =~ /localhost/) {
|
||||||
|
@ -27,6 +27,23 @@ class packstack::nova::compute::libvirt ()
|
|||||||
Service <| title == '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':
|
class { '::nova::compute::libvirt':
|
||||||
libvirt_virt_type => $libvirt_virt_type,
|
libvirt_virt_type => $libvirt_virt_type,
|
||||||
vncserver_listen => $libvirt_vnc_bind_host,
|
vncserver_listen => $libvirt_vnc_bind_host,
|
||||||
|
@ -20,8 +20,8 @@ SCENARIO=${SCENARIO:-scenario001}
|
|||||||
# We could want to override the default repositories or install behavior
|
# We could want to override the default repositories or install behavior
|
||||||
INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
|
INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
|
||||||
MANAGE_REPOS=${MANAGE_REPOS:-true}
|
MANAGE_REPOS=${MANAGE_REPOS:-true}
|
||||||
DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-master/current-passed-ci/delorean.repo}
|
DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-ocata/current-passed-ci/delorean.repo}
|
||||||
DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-master/delorean-deps.repo}
|
DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-ocata/delorean-deps.repo}
|
||||||
GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org}
|
GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org}
|
||||||
ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
|
ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
|
||||||
# If logs should be retrieved automatically
|
# If logs should be retrieved automatically
|
||||||
|
Loading…
Reference in New Issue
Block a user