starlingx/stx-puppet
Code Issues Proposed changes

Merge "Collapse glance into platform in ControllerFS API"

Browse Source
This commit is contained in:
Zuul 2019-08-09 17:59:52 +00:00 committed by Gerrit Code Review
commit af56daf6c9
6 changed files with 18 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
puppet-manifests/src/modules/openstack/manifests/keystone.pp
View File

@ -34,9 +34,9 @@ class openstack::keystone (
$::platform::params::distributed_cloud_role == 'subcloud') { $::platform::params::distributed_cloud_role == 'subcloud') {
include ::platform::amqp::params include ::platform::amqp::params
include ::platform::network::mgmt::params include ::platform::network::mgmt::params
include ::platform::drbd::cgcs::params include ::platform::drbd::platform::params
$keystone_key_repo_path = "${::platform::drbd::cgcs::params::mountpoint}/keystone" $keystone_key_repo_path = "${::platform::drbd::platform::params::mountpoint}/keystone"
$eng_workers = $::platform::params::eng_workers $eng_workers = $::platform::params::eng_workers
# FIXME(mpeters): binding to wildcard address to allow bootstrap transition # FIXME(mpeters): binding to wildcard address to allow bootstrap transition
@ -196,9 +196,9 @@ class openstack::keystone::bootstrap(
) { ) {
include ::platform::params include ::platform::params
include ::platform::amqp::params include ::platform::amqp::params
include ::platform::drbd::cgcs::params include ::platform::drbd::platform::params
$keystone_key_repo_path = "${::platform::drbd::cgcs::params::mountpoint}/keystone" $keystone_key_repo_path = "${::platform::drbd::platform::params::mountpoint}/keystone"
$eng_workers = $::platform::params::eng_workers $eng_workers = $::platform::params::eng_workers
$bind_host = '[::]' $bind_host = '[::]'
@ -223,7 +223,7 @@ class openstack::keystone::bootstrap(
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
require => Class['::platform::drbd::cgcs'], require => Class['::platform::drbd::platform'],
} }
-> file { '/etc/keystone/keystone-extra.conf': -> file { '/etc/keystone/keystone-extra.conf':
ensure => present, ensure => present,
@ -407,18 +407,18 @@ class openstack::keystone::upgrade (
include ::platform::params include ::platform::params
include ::platform::amqp::params include ::platform::amqp::params
include ::platform::network::mgmt::params include ::platform::network::mgmt::params
include ::platform::drbd::cgcs::params include ::platform::drbd::platform::params
# the unit address is actually the configured default of the loopback address. # the unit address is actually the configured default of the loopback address.
$bind_host = $::platform::network::mgmt::params::controller0_address $bind_host = $::platform::network::mgmt::params::controller0_address
$eng_workers = $::platform::params::eng_workers $eng_workers = $::platform::params::eng_workers
$keystone_key_repo = "${::platform::drbd::cgcs::params::mountpoint}/keystone" $keystone_key_repo = "${::platform::drbd::platform::params::mountpoint}/keystone"
# TODO(aning): For R5->R6 upgrade, a local keystone fernet keys repository may # TODO(aning): For R5->R6 upgrade, a local keystone fernet keys repository may
# need to be setup for the local keystone instance on standby controller to # need to be setup for the local keystone instance on standby controller to
# service specific upgrade operations, since we need to keep the keys repository # service specific upgrade operations, since we need to keep the keys repository
# in /opt/cgcs/keystone/fernet-keys intact so that service won't fail on active # in /opt/platform/keystone/fernet-keys intact so that service won't fail on active
# controller during upgrade. Once the upgade finishes, the temparary local # controller during upgrade. Once the upgade finishes, the temparary local
# fernet keys repository will be deleted. # fernet keys repository will be deleted.

37
puppet-manifests/src/modules/platform/manifests/drbd.pp
View File

@ -170,7 +170,7 @@ class platform::drbd::rabbit ()
class platform::drbd::platform::params ( class platform::drbd::platform::params (
$device = '/dev/drbd2', $device = '/dev/drbd2',
$lv_name = 'platform-lv', $lv_name = 'platform-lv',
$lv_size = '2', $lv_size = '10',
$mountpoint = '/opt/platform', $mountpoint = '/opt/platform',
$port = '7790', $port = '7790',
$vg_name = 'cgts-vg', $vg_name = 'cgts-vg',
@ -192,31 +192,6 @@ class platform::drbd::platform ()
} }
class platform::drbd::cgcs::params (
$device = '/dev/drbd3',
$lv_name = 'cgcs-lv',
$lv_size = '2',
$mountpoint = '/opt/cgcs',
$port = '7791',
$resource_name = 'drbd-cgcs',
$vg_name = 'cgts-vg',
) {}
class platform::drbd::cgcs ()
inherits ::platform::drbd::cgcs::params {
platform::drbd::filesystem { $resource_name:
vg_name => $vg_name,
lv_name => $lv_name,
lv_size => $lv_size,
port => $port,
device => $device,
mountpoint => $mountpoint,
resync_after => 'drbd-platform',
}
}
class platform::drbd::extension::params ( class platform::drbd::extension::params (
$device = '/dev/drbd5', $device = '/dev/drbd5',
$lv_name = 'extension-lv', $lv_name = 'extension-lv',
@ -231,10 +206,10 @@ class platform::drbd::extension (
) inherits ::platform::drbd::extension::params { ) inherits ::platform::drbd::extension::params {
include ::platform::params include ::platform::params
include ::platform::drbd::cgcs::params include ::platform::drbd::platform::params
if str2bool($::is_primary_disk_rotational) { if str2bool($::is_primary_disk_rotational) {
$resync_after = $::platform::drbd::cgcs::params::resource_name $resync_after = $::platform::drbd::platform::params::resource_name
} else { } else {
$resync_after = undef $resync_after = undef
} }
@ -499,7 +474,6 @@ class platform::drbd(
include ::platform::drbd::pgsql include ::platform::drbd::pgsql
include ::platform::drbd::rabbit include ::platform::drbd::rabbit
include ::platform::drbd::platform include ::platform::drbd::platform
include ::platform::drbd::cgcs
include ::platform::drbd::extension include ::platform::drbd::extension
include ::platform::drbd::patch_vault include ::platform::drbd::patch_vault
include ::platform::drbd::etcd include ::platform::drbd::etcd
@ -530,7 +504,6 @@ class platform::drbd::bootstrap {
include ::platform::drbd::pgsql include ::platform::drbd::pgsql
include ::platform::drbd::rabbit include ::platform::drbd::rabbit
include ::platform::drbd::platform include ::platform::drbd::platform
include ::platform::drbd::cgcs
include ::platform::drbd::extension include ::platform::drbd::extension
} }
@ -558,10 +531,10 @@ class platform::drbd::pgsql::runtime {
} }
class platform::drbd::cgcs::runtime { class platform::drbd::platform::runtime {
include ::platform::drbd::params include ::platform::drbd::params
include ::platform::drbd::runtime_service_enable include ::platform::drbd::runtime_service_enable
include ::platform::drbd::cgcs include ::platform::drbd::platform
} }

2
puppet-manifests/src/modules/platform/manifests/helm.pp
View File

@ -1,5 +1,5 @@
class platform::helm::repositories::params( class platform::helm::repositories::params(
$source_helm_repos_base_dir = '/opt/cgcs/helm_charts', $source_helm_repos_base_dir = '/opt/platform/helm_charts',
$target_helm_repos_base_dir = '/www/pages/helm_charts', $target_helm_repos_base_dir = '/www/pages/helm_charts',
$helm_repositories = [ 'stx-platform', 'starlingx' ], $helm_repositories = [ 'stx-platform', 'starlingx' ],
) {} ) {}

1
puppet-manifests/src/modules/platform/manifests/network.pp
View File

@ -39,7 +39,6 @@ class platform::network::mgmt::params(
$mtu = 1500, $mtu = 1500,
# network type specific parameters # network type specific parameters
$platform_nfs_address = undef, $platform_nfs_address = undef,
$cgcs_nfs_address = undef,
) { } ) { }
class platform::network::oam::params( class platform::network::oam::params(

37
puppet-manifests/src/modules/platform/manifests/sm.pp
View File

@ -46,11 +46,6 @@ class platform::sm
$ironic_ip_param_ip = $::platform::network::ironic::params::controller_address $ironic_ip_param_ip = $::platform::network::ironic::params::controller_address
$ironic_ip_param_mask = $::platform::network::ironic::params::subnet_prefixlen $ironic_ip_param_mask = $::platform::network::ironic::params::subnet_prefixlen
include ::platform::drbd::cgcs::params
$cgcs_drbd_resource = $::platform::drbd::cgcs::params::resource_name
$cgcs_fs_device = $::platform::drbd::cgcs::params::device
$cgcs_fs_directory = $::platform::drbd::cgcs::params::mountpoint
include ::platform::drbd::pgsql::params include ::platform::drbd::pgsql::params
$pg_drbd_resource = $::platform::drbd::pgsql::params::resource_name $pg_drbd_resource = $::platform::drbd::pgsql::params::resource_name
$pg_fs_device = $::platform::drbd::pgsql::params::device $pg_fs_device = $::platform::drbd::pgsql::params::device
@ -130,18 +125,12 @@ class platform::sm
$platform_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen $platform_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
$platform_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url $platform_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
# CGCS NFS network is over the management network
$cgcs_nfs_ip_interface = $::platform::network::mgmt::params::interface_name
$cgcs_nfs_ip_param_ip = $::platform::network::mgmt::params::cgcs_nfs_address
$cgcs_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
$cgcs_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
$platform_nfs_subnet_url = "${platform_nfs_ip_network_url}/${platform_nfs_ip_param_mask}" $platform_nfs_subnet_url = "${platform_nfs_ip_network_url}/${platform_nfs_ip_param_mask}"
$cgcs_nfs_subnet_url = "${cgcs_nfs_ip_network_url}/${cgcs_nfs_ip_param_mask}"
# lint:ignore:140chars # lint:ignore:140chars
$nfs_server_mgmt_exports = "${cgcs_nfs_subnet_url}:${cgcs_fs_directory},${platform_nfs_subnet_url}:${platform_fs_directory},${platform_nfs_subnet_url}:${extension_fs_directory}" $nfs_server_mgmt_exports = "${platform_nfs_subnet_url}:${platform_fs_directory},${platform_nfs_subnet_url}:${extension_fs_directory}"
$nfs_server_mgmt_mounts = "${cgcs_fs_device}:${cgcs_fs_directory},${platform_fs_device}:${platform_fs_directory},${extension_fs_device}:${extension_fs_directory}" $nfs_server_mgmt_mounts = "${platform_fs_device}:${platform_fs_directory},${extension_fs_device}:${extension_fs_directory}"
# lint:endignore:140chars # lint:endignore:140chars
################## Openstack Parameters ###################### ################## Openstack Parameters ######################
@ -368,18 +357,6 @@ class platform::sm
command => "sm-configure service_instance dockerdistribution-fs dockerdistribution-fs \"device=${dockerdistribution_fs_device},directory=${dockerdistribution_fs_directory},options=noatime,nodiratime,fstype=ext4,check_level=20\"", command => "sm-configure service_instance dockerdistribution-fs dockerdistribution-fs \"device=${dockerdistribution_fs_device},directory=${dockerdistribution_fs_directory},options=noatime,nodiratime,fstype=ext4,check_level=20\"",
} }
exec { 'Configure CGCS DRBD':
command => "sm-configure service_instance drbd-cgcs drbd-cgcs:${hostunit} drbd_resource=${cgcs_drbd_resource}",
}
exec { 'Configure CGCS FileSystem':
command => "sm-configure service_instance cgcs-fs cgcs-fs \"device=${cgcs_fs_device},directory=${cgcs_fs_directory},options=noatime,nodiratime,fstype=ext4,check_level=20\"",
}
exec { 'Configure CGCS Export FileSystem':
command => "sm-configure service_instance cgcs-export-fs cgcs-export-fs \"fsid=1,directory=${cgcs_fs_directory},options=rw,sync,no_root_squash,no_subtree_check,clientspec=${cgcs_nfs_subnet_url},unlock_on_stop=true\"",
}
exec { 'Configure Extension DRBD': exec { 'Configure Extension DRBD':
command => "sm-configure service_instance drbd-extension drbd-extension:${hostunit} \"drbd_resource=${extension_drbd_resource}\"", command => "sm-configure service_instance drbd-extension drbd-extension:${hostunit} \"drbd_resource=${extension_drbd_resource}\"",
} }
@ -421,16 +398,6 @@ class platform::sm
command => "sm-configure service_instance etcd-fs etcd-fs \"device=${etcd_fs_device},directory=${etcd_fs_directory},options=noatime,nodiratime,fstype=ext4,check_level=20\"", command => "sm-configure service_instance etcd-fs etcd-fs \"device=${etcd_fs_device},directory=${etcd_fs_directory},options=noatime,nodiratime,fstype=ext4,check_level=20\"",
} }
if $system_mode == 'duplex-direct' or $system_mode == 'simplex' {
exec { 'Configure CGCS NFS':
command => "sm-configure service_instance cgcs-nfs-ip cgcs-nfs-ip \"ip=${cgcs_nfs_ip_param_ip},cidr_netmask=${cgcs_nfs_ip_param_mask},nic=${cgcs_nfs_ip_interface},arp_count=7,dc=yes\"",
}
} else {
exec { 'Configure CGCS NFS':
command => "sm-configure service_instance cgcs-nfs-ip cgcs-nfs-ip \"ip=${cgcs_nfs_ip_param_ip},cidr_netmask=${cgcs_nfs_ip_param_mask},nic=${cgcs_nfs_ip_interface},arp_count=7\"",
}
}
# TODO: region code needs to be revisited # TODO: region code needs to be revisited
if $region_config { if $region_config {
# In a default Multi-Region configuration, Keystone is running as a # In a default Multi-Region configuration, Keystone is running as a

4
puppet-manifests/src/modules/platform/manifests/sysinv.pp
View File

@ -12,12 +12,12 @@ class platform::sysinv
include ::platform::params include ::platform::params
include ::platform::amqp::params include ::platform::amqp::params
include ::platform::drbd::cgcs::params include ::platform::drbd::platform::params
# sysinv-agent is started on all hosts # sysinv-agent is started on all hosts
include ::sysinv::agent include ::sysinv::agent
$keystone_key_repo_path = "${::platform::drbd::cgcs::params::mountpoint}/keystone" $keystone_key_repo_path = "${::platform::drbd::platform::params::mountpoint}/keystone"
group { 'sysinv': group { 'sysinv':
ensure => 'present', ensure => 'present',