x
/
packstack
Code Issues Proposed changes

Fix deprecated parameters in Heat and Manila 

Puppet-heat removed the heat::engine::heat_watch_server_url parameter
in [1]. Also, puppet-manila removed deprecated parameters for Nova and
Neutron in [2][3], and Cinder parameters in [4].

[1] - https://review.opendev.org/723222
[2] - https://review.opendev.org/723231
[3] - https://review.opendev.org/723232
[4] - https://review.opendev.org/723239

Change-Id: I41ae3bba8ccb2f3a7fa3e5742e8384e5431b62f6
This commit is contained in:
Javier Pena 2020-04-28 11:08:34 +02:00
parent 27ca9a13f1
commit 4f58975d6c
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packstack/puppet/modules/packstack/manifests/heat.pp
View File

@ -12,7 +12,6 @@ class packstack::heat ()
class { '::heat::engine':
heat_metadata_server_url => "http://${heat_cfg_ctrl_host}:8000",
heat_waitcondition_server_url => "http://${heat_cfg_ctrl_host}:8000/v1/waitcondition",
heat_watch_server_url => "http://${heat_cfg_ctrl_host}:8003",
auth_encryption_key => hiera('CONFIG_HEAT_AUTH_ENC_KEY'),
num_engine_workers => hiera('CONFIG_SERVICE_WORKERS'),
}

18
packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
View File

@ -10,13 +10,6 @@ class packstack::manila::backend::generic ()
packstack::manila::network{ 'generic': }
if ($::manila_network_type == 'neutron'){
$service_instance_network_helper_type = 'neutron'
}
elsif ($::manila_network_type == 'nova-network'){
$service_instance_network_helper_type = 'nova'
}
$admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$admin_tenant = 'admin'
@ -34,17 +27,18 @@ class packstack::manila::backend::generic ()
service_image_location => hiera('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),
service_instance_user => hiera('CONFIG_MANILA_SERVICE_INSTANCE_USER'),
service_instance_password => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),
service_instance_network_helper_type => $service_instance_network_helper_type,
service_instance_flavor_id => 66,
}
class { '::manila::compute::nova':
nova_admin_password => hiera('CONFIG_NOVA_KS_PW'),
nova_admin_tenant_name => 'services',
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_NOVA_KS_PW'),
}
class { '::manila::volume::cinder':
cinder_admin_password => hiera('CONFIG_CINDER_KS_PW'),
cinder_admin_tenant_name => 'services',
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_CINDER_KS_PW'),
}
}

5
packstack/puppet/modules/packstack/manifests/manila/network.pp
View File

@ -4,8 +4,9 @@ define packstack::manila::network ($backend_name = $name) {
if ($manila_network_type == 'neutron'){
class { '::manila::network::neutron':
neutron_admin_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_admin_tenant_name => 'services',
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_NEUTRON_KS_PW'),
}
}
elsif ($manila_network_type == 'nova-network'){