Remove puppet SM calls for obsoleted services
The SM database had several services removed. This change removes the calls to disable and deprovision those services that no longer exist. Story: 2004764 Task: 30247 Change-Id: I8834803b5ebbd5f41af9af7fab3f225da4cecb99 Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey
parent
eeaeffc0cc
commit
b9d966b7e2
|
|
@ -1,2 +1,2 @@
|
|||
SRC_DIR="src"
|
||||
TIS_PATCH_VER=83
|
||||
TIS_PATCH_VER=84
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ class platform::postgresql::server (
|
|||
# 1500 connections
|
||||
# 80 MB shared buffer
|
||||
# work_mem 512 MB since some ceilometer queries entail extensive
|
||||
# TODO: with ceilometer removed, determine if work_mem can be revisited
|
||||
# sorting as well as hash joins and hash based aggregation.
|
||||
# checkpoint_segments increased to reduce frequency of checkpoints
|
||||
if str2bool($::is_worker_subfunction) or str2bool($::is_virtual) {
|
||||
|
|
|
|||
|
|
@ -459,55 +459,6 @@ class platform::sm
|
|||
}
|
||||
}
|
||||
|
||||
# Glance
|
||||
exec { 'Deprovision OpenStack - Glance Registry (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services glance-registry',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Glance Registry(service)':
|
||||
command => 'sm-deprovision service glance-registry',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Glance API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services glance-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Glance API(service)':
|
||||
command => 'sm-deprovision service glance-api',
|
||||
}
|
||||
|
||||
# Cinder
|
||||
exec { 'Deprovision OpenStack - Cinder API (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services cinder-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder API (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service cinder-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Scheduler (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services cinder-scheduler',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Scheduler (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service cinder-scheduler',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Volume (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services cinder-volume',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Volume (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service cinder-volume',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Backup (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services cinder-backup',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Cinder Backup (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service cinder-backup',
|
||||
}
|
||||
|
||||
# Re-using cinder-ip for cluster-host-ip for now
|
||||
# This will be changed when the cluster-host-ip resource is added to SM
|
||||
exec { 'Configure Cinder IP in SM (service-group-member cinder-ip)':
|
||||
|
|
@ -528,179 +479,6 @@ class platform::sm
|
|||
}
|
||||
}
|
||||
|
||||
# TODO: this entire section needs to be removed from SM.
|
||||
# After these are removed from SM, this entire section of
|
||||
# deprovision calls will not be needed
|
||||
# Deprovision Openstack services if Kubernetes Config is enabled
|
||||
|
||||
# Deprovision Nova Services
|
||||
exec { 'Deprovision OpenStack - Nova API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova API(service)':
|
||||
command => 'sm-deprovision service nova-api',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova API Proxy (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-api-proxy',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova API Proxy(service)':
|
||||
command => 'sm-deprovision service nova-api-proxy',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova Placement API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-placement-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Placement API(service)':
|
||||
command => 'sm-deprovision service nova-placement-api',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova Scheduler (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-scheduler',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Scheduler(service)':
|
||||
command => 'sm-deprovision service nova-scheduler',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova Conductor (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-conductor',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Conductor(service)':
|
||||
command => 'sm-deprovision service nova-conductor',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova Console Auth (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-console-auth',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Console Auth(service)':
|
||||
command => 'sm-deprovision service nova-console-auth',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Nova NoVNC (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-novnc',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova NoVNC(service)':
|
||||
command => 'sm-deprovision service nova-novnc',
|
||||
}
|
||||
|
||||
# Deprovision Celiometer
|
||||
exec { 'Deprovision OpenStack - Ceilometer Agent Notification (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services ceilometer-agent-notification',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Ceilometer Agent Notification(service)':
|
||||
command => 'sm-deprovision service ceilometer-agent-notification',
|
||||
}
|
||||
|
||||
# Deprovision Neutron Server
|
||||
exec { 'Deprovision OpenStack - Neutron Server (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services neutron-server',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Neutron Server (service)':
|
||||
command => 'sm-deprovision service neutron-server',
|
||||
}
|
||||
|
||||
# Heat
|
||||
exec { 'Deprovision OpenStack - Heat Engine (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services heat-engine',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Heat Engine(service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service heat-engine',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Heat API (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services heat-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Heat API (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service heat-api',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Heat API CFN (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services heat-api-cfn',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Heat API CFN (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service heat-api-cfn',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - Heat API CloudWatch (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services heat-api-cloudwatch',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Heat API CloudWatch (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service heat-api-cloudwatch',
|
||||
}
|
||||
|
||||
# Gnocchi
|
||||
exec { 'Deprovision OpenStack - Gnocchi API (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services gnocchi-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Gnocchi API (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service gnocchi-api',
|
||||
}
|
||||
exec { 'Deprovision OpenStack - Gnocchi metricd (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services gnocchi-metricd',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Gnocchi metricd (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service gnocchi-metricd',
|
||||
}
|
||||
|
||||
# AODH
|
||||
exec { 'Deprovision OpenStack - AODH API (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services aodh-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - AODH API (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service aodh-api',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - AODH Evaluator (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services aodh-evaluator',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - AODH Evaluator (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service aodh-evaluator',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - AODH Listener (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services aodh-listener',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - AODH Listener (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service aodh-listener',
|
||||
}
|
||||
|
||||
exec { 'Deprovision OpenStack - AODH Notifier (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services aodh-notifier',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - AODH Notifier (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service aodh-notifier',
|
||||
}
|
||||
|
||||
# Panko
|
||||
exec { 'Deprovision OpenStack - Panko API (service-group-member)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service-group-member cloud-services panko-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Panko API (service)':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/usr/local/bin', '/etc', '/sbin', '/bin' ],
|
||||
command => 'sm-deprovision service panko-api',
|
||||
}
|
||||
|
||||
exec { 'Configure NFS Management':
|
||||
command => "sm-configure service_instance nfs-mgmt nfs-mgmt \"exports=${nfs_server_mgmt_exports},mounts=${nfs_server_mgmt_mounts}\"",
|
||||
}
|
||||
|
|
@ -931,72 +709,6 @@ class platform::sm
|
|||
}
|
||||
}
|
||||
|
||||
# Murano
|
||||
exec { 'Deprovision Murano Rabbitmq (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member controller-services murano-rabbit',
|
||||
}
|
||||
-> exec { 'Deprovision Murano Rabbitmq (service)':
|
||||
command => 'sm-deprovision service murano-rabbit',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Murano API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services murano-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Murano API (service)':
|
||||
command => 'sm-deprovision service murano-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Murano Engine (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services murano-engine',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Murano Engine (service)':
|
||||
command => 'sm-deprovision service murano-engine',
|
||||
}
|
||||
|
||||
# Magnum
|
||||
exec { 'Deprovision OpenStack - Magnum API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services magnum-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Magnum API (service)':
|
||||
command => 'sm-deprovision service magnum-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Magnum Conductor (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services magnum-conductor',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Magnum Conductor (service)':
|
||||
command => 'sm-deprovision service magnum-conductor',
|
||||
}
|
||||
|
||||
# Ironic
|
||||
exec { 'Deprovision OpenStack - Ironic API (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services ironic-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Ironic API (service)':
|
||||
command => 'sm-deprovision service ironic-api',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Ironic Conductor (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services ironic-conductor',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Ironic Conductor (service)':
|
||||
command => 'sm-deprovision service ironic-conductor',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Compute (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-compute',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Compute (service)':
|
||||
command => 'sm-deprovision service nova-compute',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Serialproxy (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member cloud-services nova-serialproxy',
|
||||
}
|
||||
-> exec { 'Deprovision OpenStack - Nova Serialproxy (service)':
|
||||
command => 'sm-deprovision service nova-serialproxy',
|
||||
}
|
||||
-> exec { 'Provision Ironic TFTP Floating IP (service-group-member)':
|
||||
command => 'sm-deprovision service-group-member controller-services ironic-tftp-ip',
|
||||
}
|
||||
-> exec { 'Provision Ironic TFTP Floating IP (service)':
|
||||
command => 'sm-deprovision service ironic-tftp-ip',
|
||||
}
|
||||
|
||||
if $ceph_configured {
|
||||
if $system_type == 'All-in-one' and 'duplex' in $system_mode {
|
||||
exec { 'Provision Cephmon FS in SM (service-group-member cephmon-fs)':
|
||||
|
|
|
|||
Loading…
Reference in New Issue