From cb630d03bed66b011ba57fcd61b7e8fb9532dd83 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 16 Sep 2021 13:42:29 -0600 Subject: [PATCH] Remove mistral Mistral was deprecated in Wallaby and is no longer in use on the undercloud and it hasn't been officially supported in the overcloud for some time. Change-Id: I6963453f53cb554ca8fdb58706f04838bbd11ba0 --- README.rst | 2 - ci/environments/scenario000-standalone.yaml | 4 - ci/environments/scenario003-standalone.yaml | 4 - deployment/deprecated/mistral/mapping.json | 373 ----------------- .../mistral/mistral-api-container-puppet.yaml | 270 ------------ .../deprecated/mistral/mistral-base.yaml | 121 ------ .../mistral-engine-container-puppet.yaml | 141 ------- ...mistral-event-engine-container-puppet.yaml | 116 ------ .../mistral-executor-container-puppet.yaml | 252 ------------ .../haproxy-edge-container-puppet.yaml | 1 - environments/services-baremetal/mistral.yaml | 6 - environments/services/mistral.yaml | 6 - .../ssl/tls-endpoints-public-dns.yaml | 1 - environments/ssl/tls-endpoints-public-ip.yaml | 1 - .../ssl/tls-everywhere-endpoints-dns.yaml | 3 - .../standalone/standalone-overcloud.yaml | 4 - .../standalone/standalone-tripleo.yaml | 4 - environments/storage/nova-nfs.yaml | 2 +- environments/undercloud-enable-nova.yaml | 2 - .../undercloud/undercloud-minion.yaml | 4 - network/endpoints/endpoint_map.yaml | 384 ------------------ overcloud-resource-registry-puppet.j2.yaml | 8 - .../mistral-removal-df87b8dd8bf6bd4e.yaml | 5 + roles/Controller.yaml | 4 - roles/ControllerAllNovaStandalone.yaml | 4 - roles/ControllerNoCeph.yaml | 4 - roles/ControllerNovaStandalone.yaml | 4 - roles/ControllerOpenstack.yaml | 4 - roles/ControllerSriov.yaml | 4 - roles/ControllerStorageDashboard.yaml | 4 - roles/ControllerStorageNfs.yaml | 4 - roles/Standalone.yaml | 4 - roles/Undercloud.yaml | 4 - roles_data.yaml | 4 - roles_data_undercloud.yaml | 4 - sample-env-generator/ssl.yaml | 5 - sample-env-generator/standalone.yaml | 10 - sample-env-generator/undercloud-minion.yaml | 4 - 38 files changed, 6 insertions(+), 1775 deletions(-) delete mode 100644 deployment/deprecated/mistral/mapping.json delete mode 100644 deployment/deprecated/mistral/mistral-api-container-puppet.yaml delete mode 100644 deployment/deprecated/mistral/mistral-base.yaml delete mode 100644 deployment/deprecated/mistral/mistral-engine-container-puppet.yaml delete mode 100644 deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml delete mode 100644 deployment/deprecated/mistral/mistral-executor-container-puppet.yaml delete mode 100644 environments/services-baremetal/mistral.yaml delete mode 100644 environments/services/mistral.yaml create mode 100644 releasenotes/notes/mistral-removal-df87b8dd8bf6bd4e.yaml diff --git a/README.rst b/README.rst index a81abf3aa1..acb5cf3acd 100644 --- a/README.rst +++ b/README.rst @@ -110,8 +110,6 @@ and should be executed according to the following table: +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | timezone | X | X | X | X | X | X | X | X | X | X | X | X | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ -| mistral | | | | X | | | | | | | | | -+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | swift | | | X | | | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | aodh | | X | X | | | | | | | | | | diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index 32ea640352..87eb945a17 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -97,10 +97,6 @@ resource_registry: OS::TripleO::Services::MasqueradeNetworks: OS::Heat::None OS::TripleO::Services::Memcached: OS::Heat::None OS::TripleO::Services::MetricsQdr: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::Multipathd: OS::Heat::None # OS::TripleO::Services::MySQL: OS::Heat::None OS::TripleO::Services::NeutronApi: OS::Heat::None diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 6c98ec00aa..8c45213f39 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -6,10 +6,6 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml - OS::TripleO::Services::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml - OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml diff --git a/deployment/deprecated/mistral/mapping.json b/deployment/deprecated/mistral/mapping.json deleted file mode 100644 index 53cade5966..0000000000 --- a/deployment/deprecated/mistral/mapping.json +++ /dev/null @@ -1,373 +0,0 @@ -{ - "_comment": "Mapping OpenStack action namespaces to all its actions. Each action name is mapped to python-client method name in this namespace.", - "nova": { - "_comment": "It uses novaclient.v2.", - "agents_convert_into_with_meta": "agents.convert_into_with_meta", - "agents_create": "agents.create", - "agents_delete": "agents.delete", - "agents_find": "agents.find", - "agents_findall": "agents.findall", - "agents_list": "agents.list", - "agents_update": "agents.update", - "aggregates_add_host": "aggregates.add_host", - "aggregates_convert_into_with_meta": "aggregates.convert_into_with_meta", - "aggregates_create": "aggregates.create", - "aggregates_delete": "aggregates.delete", - "aggregates_find": "aggregates.find", - "aggregates_findall": "aggregates.findall", - "aggregates_get": "aggregates.get", - "aggregates_get_details": "aggregates.get_details", - "aggregates_list": "aggregates.list", - "aggregates_remove_host": "aggregates.remove_host", - "aggregates_set_metadata": "aggregates.set_metadata", - "aggregates_update": "aggregates.update", - "availability_zones_convert_into_with_meta": "availability_zones.convert_into_with_meta", - "availability_zones_find": "availability_zones.find", - "availability_zones_findall": "availability_zones.findall", - "availability_zones_list": "availability_zones.list", - "flavor_access_add_tenant_access": "flavor_access.add_tenant_access", - "flavor_access_convert_into_with_meta": "flavor_access.convert_into_with_meta", - "flavor_access_find": "flavor_access.find", - "flavor_access_findall": "flavor_access.findall", - "flavor_access_list": "flavor_access.list", - "flavor_access_remove_tenant_access": "flavor_access.remove_tenant_access", - "flavors_convert_into_with_meta": "flavors.convert_into_with_meta", - "flavors_create": "flavors.create", - "flavors_delete": "flavors.delete", - "flavors_find": "flavors.find", - "flavors_findall": "flavors.findall", - "flavors_get": "flavors.get", - "flavors_list": "flavors.list", - "hypervisor_stats_convert_into_with_meta": "hypervisor_stats.convert_into_with_meta", - "hypervisor_stats_statistics": "hypervisor_stats.statistics", - "hypervisors_convert_into_with_meta": "hypervisors.convert_into_with_meta", - "hypervisors_find": "hypervisors.find", - "hypervisors_findall": "hypervisors.findall", - "hypervisors_get": "hypervisors.get", - "hypervisors_list": "hypervisors.list", - "hypervisors_search": "hypervisors.search", - "hypervisors_statistics": "hypervisors.statistics", - "hypervisors_uptime": "hypervisors.uptime", - "glance_find_image": "glance.find_image", - "glance_list": "glance.list", - "keypairs_convert_into_with_meta": "keypairs.convert_into_with_meta", - "keypairs_create": "keypairs.create", - "keypairs_delete": "keypairs.delete", - "keypairs_find": "keypairs.find", - "keypairs_findall": "keypairs.findall", - "keypairs_get": "keypairs.get", - "keypairs_list": "keypairs.list", - "limits_convert_into_with_meta": "limits.convert_into_with_meta", - "limits_get": "limits.get", - "neutron_find_network": "neutron.find_network", - "quota_classes_convert_into_with_meta": "quota_classes.convert_into_with_meta", - "quota_classes_get": "quota_classes.get", - "quota_classes_update": "quota_classes.update", - "quotas_convert_into_with_meta": "quotas.convert_into_with_meta", - "quotas_defaults": "quotas.defaults", - "quotas_delete": "quotas.delete", - "quotas_get": "quotas.get", - "quotas_update": "quotas.update", - "server_groups_convert_into_with_meta": "server_groups.convert_into_with_meta", - "server_groups_create": "server_groups.create", - "server_groups_delete": "server_groups.delete", - "server_groups_find": "server_groups.find", - "server_groups_findall": "server_groups.findall", - "server_groups_get": "server_groups.get", - "server_groups_list": "server_groups.list", - "server_migrations_convert_into_with_meta": "server_migrations.convert_into_with_meta", - "server_migrations_find": "server_migrations.find", - "server_migrations_findall": "server_migrations.findall", - "server_migrations_get": "server_migrations.get", - "server_migrations_list": "server_migrations.list", - "server_migrations_live_migrate_force_complete": "server_migrations.live_migrate_force_complete", - "server_migrations_live_migration_abort": "server_migrations.live_migration_abort", - "servers_add_security_group": "servers.add_security_group", - "servers_backup": "servers.backup", - "servers_change_password": "servers.change_password", - "servers_clear_password": "servers.clear_password", - "servers_confirm_resize": "servers.confirm_resize", - "servers_convert_into_with_meta": "servers.convert_into_with_meta", - "servers_create": "servers.create", - "servers_create_image": "servers.create_image", - "servers_delete": "servers.delete", - "servers_delete_meta": "servers.delete_meta", - "servers_diagnostics": "servers.diagnostics", - "servers_evacuate": "servers.evacuate", - "servers_find": "servers.find", - "servers_findall": "servers.findall", - "servers_force_delete": "servers.force_delete", - "servers_get": "servers.get", - "servers_get_console_output": "servers.get_console_output", - "servers_get_mks_console": "servers.get_mks_console", - "servers_get_password": "servers.get_password", - "servers_get_rdp_console": "servers.get_rdp_console", - "servers_get_serial_console": "servers.get_serial_console", - "servers_get_spice_console": "servers.get_spice_console", - "servers_get_vnc_console": "servers.get_vnc_console", - "servers_interface_attach": "servers.interface_attach", - "servers_interface_detach": "servers.interface_detach", - "servers_interface_list": "servers.interface_list", - "servers_ips": "servers.ips", - "servers_list": "servers.list", - "servers_list_security_group": "servers.list_security_group", - "servers_live_migrate": "servers.live_migrate", - "servers_lock": "servers.lock", - "servers_migrate": "servers.migrate", - "servers_pause": "servers.pause", - "servers_reboot": "servers.reboot", - "servers_rebuild": "servers.rebuild", - "servers_remove_security_group": "servers.remove_security_group", - "servers_rescue": "servers.rescue", - "servers_reset_network": "servers.reset_network", - "servers_reset_state": "servers.reset_state", - "servers_resize": "servers.resize", - "servers_restore": "servers.restore", - "servers_resume": "servers.resume", - "servers_revert_resize": "servers.revert_resize", - "servers_set_meta": "servers.set_meta", - "servers_set_meta_item": "servers.set_meta_item", - "servers_shelve": "servers.shelve", - "servers_shelve_offload": "servers.shelve_offload", - "servers_start": "servers.start", - "servers_stop": "servers.stop", - "servers_suspend": "servers.suspend", - "servers_trigger_crash_dump": "servers.trigger_crash_dump", - "servers_unlock": "servers.unlock", - "servers_unpause": "servers.unpause", - "servers_unrescue": "servers.unrescue", - "servers_unshelve": "servers.unshelve", - "servers_update": "servers.update", - "services_convert_into_with_meta": "services.convert_into_with_meta", - "services_delete": "services.delete", - "services_disable": "services.disable", - "services_disable_log_reason": "services.disable_log_reason", - "services_enable": "services.enable", - "services_find": "services.find", - "services_findall": "services.findall", - "services_force_down": "services.force_down", - "services_list": "services.list", - "usage_convert_into_with_meta": "usage.convert_into_with_meta", - "usage_find": "usage.find", - "usage_findall": "usage.findall", - "usage_get": "usage.get", - "usage_list": "usage.list", - "versions_convert_into_with_meta": "versions.convert_into_with_meta", - "versions_find": "versions.find", - "versions_findall": "versions.findall", - "versions_get_current": "versions.get_current", - "versions_list": "versions.list", - "volumes_convert_into_with_meta": "volumes.convert_into_with_meta", - "volumes_create_server_volume": "volumes.create_server_volume", - "volumes_delete_server_volume": "volumes.delete_server_volume", - "volumes_get_server_volume": "volumes.get_server_volume", - "volumes_get_server_volumes": "volumes.get_server_volumes", - "volumes_update_server_volume": "volumes.update_server_volume" - }, - "heat": { - "_comment": "It uses heatclient.v1.", - "actions_cancel_update": "actions.cancel_update", - "actions_check": "actions.check", - "actions_resume": "actions.resume", - "actions_suspend": "actions.suspend", - "build_info_build_info": "build_info.build_info", - "events_get": "events.get", - "events_list": "events.list", - "resource_types_generate_template": "resource_types.generate_template", - "resource_types_get": "resource_types.get", - "resource_types_list": "resource_types.list", - "resources_generate_template": "resources.generate_template", - "resources_get": "resources.get", - "resources_list": "resources.list", - "resources_mark_unhealthy": "resources.mark_unhealthy", - "resources_metadata": "resources.metadata", - "resources_signal": "resources.signal", - "services_list": "services.list", - "software_configs_create": "software_configs.create", - "software_configs_delete": "software_configs.delete", - "software_configs_get": "software_configs.get", - "software_configs_list": "software_configs.list", - "software_deployments_create": "software_deployments.create", - "software_deployments_delete": "software_deployments.delete", - "software_deployments_get": "software_deployments.get", - "software_deployments_list": "software_deployments.list", - "software_deployments_metadata": "software_deployments.metadata", - "software_deployments_update": "software_deployments.update", - "stacks_abandon": "stacks.abandon", - "stacks_create": "stacks.create", - "stacks_delete": "stacks.delete", - "stacks_environment": "stacks.environment", - "stacks_get": "stacks.get", - "stacks_list": "stacks.list", - "stacks_output_list": "stacks.output_list", - "stacks_output_show": "stacks.output_show", - "stacks_preview": "stacks.preview", - "stacks_preview_update": "stacks.preview_update", - "stacks_restore": "stacks.restore", - "stacks_snapshot": "stacks.snapshot", - "stacks_snapshot_delete": "stacks.snapshot_delete", - "stacks_snapshot_list": "stacks.snapshot_list", - "stacks_snapshot_show": "stacks.snapshot_show", - "stacks_template": "stacks.template", - "stacks_update": "stacks.update", - "stacks_validate": "stacks.validate", - "template_versions_get": "template_versions.get", - "template_versions_list": "template_versions.list" - }, - "ironic": { - "_comment": "It uses ironicclient.v1.", - "chassis_create": "chassis.create", - "chassis_delete": "chassis.delete", - "chassis_get": "chassis.get", - "chassis_list": "chassis.list", - "chassis_list_nodes": "chassis.list_nodes", - "chassis_update": "chassis.update", - "driver_delete": "driver.delete", - "driver_get": "driver.get", - "driver_get_vendor_passthru_methods": "driver.get_vendor_passthru_methods", - "driver_list": "driver.list", - "driver_properties": "driver.properties", - "driver_raid_logical_disk_properties": "driver.raid_logical_disk_properties", - "driver_update": "driver.update", - "driver_vendor_passthru": "driver.vendor_passthru", - "node_create": "node.create", - "node_delete": "node.delete", - "node_get": "node.get", - "node_get_boot_device": "node.get_boot_device", - "node_get_by_instance_uuid": "node.get_by_instance_uuid", - "node_get_console": "node.get_console", - "node_get_supported_boot_devices": "node.get_supported_boot_devices", - "node_get_vendor_passthru_methods": "node.get_vendor_passthru_methods", - "node_list": "node.list", - "node_list_ports": "node.list_ports", - "node_set_boot_device": "node.set_boot_device", - "node_set_console_mode": "node.set_console_mode", - "node_set_maintenance": "node.set_maintenance", - "node_set_power_state": "node.set_power_state", - "node_set_provision_state": "node.set_provision_state", - "node_set_target_raid_config": "node.set_target_raid_config", - "node_states": "node.states", - "node_update": "node.update", - "node_validate": "node.validate", - "node_vendor_passthru": "node.vendor_passthru", - "node_vif_attach": "node.vif_attach", - "node_vif_detach": "node.vif_detach", - "node_vif_list": "node.vif_list", - "node_wait_for_provision_state": "node.wait_for_provision_state", - "port_create": "port.create", - "port_delete": "port.delete", - "port_get": "port.get", - "port_get_by_address": "port.get_by_address", - "port_list": "port.list", - "port_update": "port.update" - }, - "baremetal_introspection": { - "_comment": "It uses ironic_inspector_client.v1.", - "abort": "abort", - "introspect": "introspect", - "get_status": "get_status", - "get_data": "get_data", - "rules_create": "rules.create", - "rules_delete": "rules.delete", - "rules_delete_all": "rules.delete_all", - "rules_from_json": "rules.from_json", - "rules_get": "rules.get", - "rules_get_all": "rules.get_all", - "wait_for_finish": "wait_for_finish" - }, - "swift": { - "_comment": "It uses swiftclient.v1.", - "head_account": "head_account", - "get_account": "get_account", - "post_account": "post_account", - "head_container": "head_container", - "get_container": "get_container", - "put_container": "put_container", - "post_container": "post_container", - "delete_container": "delete_container", - "head_object": "head_object", - "get_object": "get_object", - "put_object": "put_object", - "post_object": "post_object", - "delete_object": "delete_object", - "copy_object": "copy_object", - "get_capabilities": "get_capabilities" - }, - "swiftservice": { - "_comment": "It uses swiftclient.service.", - "capabilities": "capabilities", - "copy": "copy", - "delete": "delete", - "download": "download", - "list": "list", - "post": "post", - "stat": "stat", - "upload": "upload" - }, - "zaqar": { - "_comment": "It uses zaqarclient.v2.", - "claim_messages": "claim_messages", - "delete_messages": "delete_messages", - "queue_messages": "queue_messages", - "queue_post": "queue_post", - "queue_pop": "queue_pop" - }, - "mistral": { - "_comment": "It uses mistralclient.v2.", - "action_executions_create": "action_executions.create", - "action_executions_delete": "action_executions.delete", - "action_executions_find": "action_executions.find", - "action_executions_get": "action_executions.get", - "action_executions_list": "action_executions.list", - "action_executions_update": "action_executions.update", - "actions_create": "actions.create", - "actions_delete": "actions.delete", - "actions_find": "actions.find", - "actions_get": "actions.get", - "actions_list": "actions.list", - "actions_update": "actions.update", - "cron_triggers_create": "cron_triggers.create", - "cron_triggers_delete": "cron_triggers.delete", - "cron_triggers_find": "cron_triggers.find", - "cron_triggers_get": "cron_triggers.get", - "cron_triggers_list": "cron_triggers.list", - "environments_create": "environments.create", - "environments_delete": "environments.delete", - "environments_find": "environments.find", - "environments_get": "environments.get", - "environments_list": "environments.list", - "environments_update": "environments.update", - "executions_create": "executions.create", - "executions_delete": "executions.delete", - "executions_find": "executions.find", - "executions_get": "executions.get", - "executions_list": "executions.list", - "executions_update": "executions.update", - "members_create": "members.create", - "members_delete": "members.delete", - "members_find": "members.find", - "members_get": "members.get", - "members_list": "members.list", - "members_update": "members.update", - "services_find": "services.find", - "services_list": "services.list", - "tasks_find": "tasks.find", - "tasks_get": "tasks.get", - "tasks_list": "tasks.list", - "tasks_rerun": "tasks.rerun", - "workbooks_create": "workbooks.create", - "workbooks_delete": "workbooks.delete", - "workbooks_find": "workbooks.find", - "workbooks_get": "workbooks.get", - "workbooks_list": "workbooks.list", - "workbooks_update": "workbooks.update", - "workbooks_validate": "workbooks.validate", - "workflows_create": "workflows.create", - "workflows_delete": "workflows.delete", - "workflows_find": "workflows.find", - "workflows_get": "workflows.get", - "workflows_list": "workflows.list", - "workflows_update": "workflows.update", - "workflows_validate": "workflows.validate" - } -} diff --git a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml deleted file mode 100644 index f94579965c..0000000000 --- a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml +++ /dev/null @@ -1,270 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Mistral API service - -parameters: - ContainerMistralApiImage: - description: image - type: string - ContainerMistralConfigImage: - description: The container image to use for the mistral config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - DeployIdentifier: - default: '' - type: string - description: > - Setting this to a unique value will re-run any deployment tasks which - perform configuration on a Heat stack-update. - MistralWorkers: - default: 1 - description: The number of workers for the mistral-api. - type: number - MistralApiPolicies: - description: | - A hash of policies to configure for Mistral API. - e.g. { mistral-context_is_admin: { key: context_is_admin, value: 'role:admin' } } - default: {} - type: json - EnableInternalTLS: - type: boolean - default: false - MistralExecutionInterval: - default: 600 - description: This setting defines how frequently Mistral checks for cron - triggers that need execution. The default is 10 minutes and - reduces the load that is has on the system. - type: number - MistralCorsAllowedOrigin: - type: string - default: '' - description: Indicate whether this resource may be shared with the domain received in the request - "origin" header. - MistralPassword: - description: The password for the Mistral service and db account, used by the Mistral services. - type: string - hidden: true - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - -conditions: - mistral_workers_zero: {equals : [{get_param: MistralWorkers}, 0]} - cors_allowed_origin_unset: {equals : [{get_param: MistralCorsAllowedOrigin}, '']} - -resources: - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../database/mysql-client.yaml - - MistralBase: - type: ./mistral-base.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Mistral API role. - value: - service_name: mistral_api - firewall_rules: - '133 mistral': - dport: - - 8989 - - 13989 - keystone_resources: - mistral: - endpoints: - public: {get_param: [EndpointMap, MistralPublic, uri]} - internal: {get_param: [EndpointMap, MistralInternal, uri]} - admin: {get_param: [EndpointMap, MistralAdmin, uri]} - users: - mistral: - password: {get_param: MistralPassword} - region: {get_param: KeystoneRegion} - service: 'workflowv2' - config_settings: - map_merge: - - get_attr: [MistralBase, role_data, config_settings] - - - if: - - cors_allowed_origin_unset - - {} - - mistral::cors::allowed_origin: {get_param: MistralCorsAllowedOrigin} - - mistral::api::api_workers: {get_param: MistralWorkers} - mistral::api::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, MistralApiNetwork]} - mistral::wsgi::apache::ssl: {get_param: EnableInternalTLS} - mistral::cors::allow_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma,X-Auth-Token' - mistral::cors::expose_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma' - mistral::policy::policies: {get_param: MistralApiPolicies} - mistral::cron_trigger::execution_interval: {get_param: MistralExecutionInterval} - mistral::api::allow_action_execution_deletion: true - mistral::api::service_name: 'httpd' - mistral::wsgi::apache::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, MistralApiNetwork]} - mistral::wsgi::apache::servername: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, MistralApiNetwork]} - - if: - - mistral_workers_zero - - {} - - mistral::wsgi::apache::workers: {get_param: MistralWorkers} - service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: mistral - puppet_tags: mistral_config - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::mistral::api - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: ContainerMistralConfigImage} - kolla_config: - /var/lib/kolla/config_files/mistral_api.json: - command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api - config_files: &mistral_api_config_files - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: &mistral_api_permissions - - path: /var/log/mistral - owner: mistral:mistral - recurse: true - /var/lib/kolla/config_files/mistral_api_db_sync.json: - command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf --openstack_actions_mapping_path=/etc/mistral/mapping.json upgrade head'" - config_files: *mistral_api_config_files - permissions: *mistral_api_permissions - /var/lib/kolla/config_files/mistral_api_db_populate.json: - # NOTE: dprince this requires that we install openstack-tripleo-common into - # the Mistral API image so that we get tripleo* actions - command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf --openstack_actions_mapping_path=/etc/mistral/mapping.json populate'" - config_files: *mistral_api_config_files - permissions: *mistral_api_permissions - - docker_config: - # db sync runs before permissions set by kolla_config - step_2: - mistral_init_logs: - image: &mistral_api_image {get_param: ContainerMistralApiImage} - net: none - privileged: false - user: root - volumes: - - /var/log/containers/mistral:/var/log/mistral:z - command: ['/bin/bash', '-c', 'chown -R mistral:mistral /var/log/mistral'] - step_3: - mistral_db_sync: - start_order: 0 - image: *mistral_api_image - net: host - privileged: false - detach: false - user: root - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_api_db_sync.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - step_4: - mistral_api: - start_order: 15 - image: *mistral_api_image - net: host - privileged: false - restart: always - healthcheck: - test: /openstack/healthcheck - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - step_5: - mistral_db_populate: - start_order: 1 - image: *mistral_api_image - net: host - privileged: false - detach: false - user: root - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_api_db_populate.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - host_prep_tasks: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - mode: "{{ item.mode|default(omit) }}" - with_items: - - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' } - deploy_steps_tasks: - - name: Copy in action mapping file - when: step|int == 3 - copy: - content: {get_file: ./mapping.json} - dest: '/var/lib/config-data/puppet-generated/mistral/etc/mistral/mapping.json' - setype: container_file_t - force: yes - mode: '0755' diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml deleted file mode 100644 index 7ab68ad9d6..0000000000 --- a/deployment/deprecated/mistral/mistral-base.yaml +++ /dev/null @@ -1,121 +0,0 @@ -heat_template_version: wallaby - -description: > - Openstack Mistral base service. Shared for all Mistral services. - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - - Debug: - default: false - description: Set to True to enable debugging on all services. - type: boolean - MistralDebug: - default: false - description: Set to True to enable debugging Mistral services. - type: boolean - EnableSQLAlchemyCollectd: - type: boolean - description: > - Set to true to enable the SQLAlchemy-collectd server plugin - default: false - MistralPassword: - description: The password for the Mistral service and db account, used by the Mistral services. - type: string - hidden: true - NotificationDriver: - type: comma_delimited_list - default: 'noop' - description: Driver or drivers to handle sending notifications. - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - MistralRpcResponseTimeout: - type: number - default: 120 - description: Mistral RPC timeout - MemcacheUseAdvancedPool: - type: boolean - description: | - Use the advanced (eventlet safe) memcached client pool. - default: true - -conditions: - enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} - -outputs: - role_data: - description: Shared role data for the Mistral services. - value: - service_name: mistral_base - config_settings: - mistral::db::database_connection: - make_url: - scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} - username: mistral - password: {get_param: MistralPassword} - host: {get_param: [EndpointMap, MysqlInternal, host]} - path: /mistral - query: - if: - - enable_sqlalchemy_collectd - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - plugin: collectd - collectd_program_name: mistral - collectd_host: localhost - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - - mistral::notification_driver: {get_param: NotificationDriver} - mistral::logging::debug: - if: - - {get_param: MistralDebug} - - true - - {get_param: Debug} - mistral::rpc_response_timeout: {get_param: MistralRpcResponseTimeout} - mistral::keystone::authtoken::project_name: 'service' - mistral::keystone::authtoken::user_domain_name: 'Default' - mistral::keystone::authtoken::project_domain_name: 'Default' - mistral::keystone::authtoken::password: {get_param: MistralPassword} - mistral::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneV3Internal, uri]} - mistral::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - mistral::keystone::authtoken::region_name: {get_param: KeystoneRegion} - mistral::keystone::authtoken::interface: 'internal' - mistral::keystone::authtoken::memcache_use_advanced_pool: {get_param: MemcacheUseAdvancedPool} - mistral::keystone_ec2_uri: - list_join: - - '' - - - {get_param: [EndpointMap, KeystoneV3Internal, uri]} - - '/ec2tokens' - service_config_settings: - mysql: - mistral::db::mysql::user: mistral - mistral::db::mysql::host: '%' - mistral::db::mysql::dbname: mistral - mistral::db::mysql::password: {get_param: MistralPassword} diff --git a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml deleted file mode 100644 index a967e2bada..0000000000 --- a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml +++ /dev/null @@ -1,141 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Mistral Engine service - -parameters: - ContainerMistralEngineImage: - description: image - type: string - ContainerMistralConfigImage: - description: The container image to use for the mistral config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - MistralExecutionFieldSizeLimit: - default: 1024 - description: The default maximum size in KB of large text fields of runtime - execution objects. Use -1 for no limit. - type: number - MistralEvaluationInterval: - default: 120 - description: How often will the executions be evaluated - (in minutes). For example for value 120 the interval - will be 2 hours (every 2 hours). - type: number - MistralFinishedExecutionDuration: - default: 2880 - description: Evaluate from which time remove executions in minutes. - For example when set to 60, remove all executions - that finished a 60 minutes ago or more. - Minimum value is 1. - Note that only final state execution will remove (SUCCESS/ERROR). - constraints: - - range: { min: 1 } - type: number - -resources: - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../database/mysql-client.yaml - - MistralBase: - type: ./mistral-base.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Mistral Engine role. - value: - service_name: mistral_engine - config_settings: - map_merge: - - get_attr: [MistralBase, role_data, config_settings] - - mistral::engine::execution_field_size_limit_kb: {get_param: MistralExecutionFieldSizeLimit} - mistral::engine::evaluation_interval: {get_param: MistralEvaluationInterval} - mistral::engine::older_than: {get_param: MistralFinishedExecutionDuration} - service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: mistral - puppet_tags: mistral_config - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::mistral::engine - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: ContainerMistralConfigImage} - kolla_config: - /var/lib/kolla/config_files/mistral_engine.json: - command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/mistral - owner: mistral:mistral - recurse: true - docker_config: - step_4: - mistral_engine: - image: {get_param: ContainerMistralEngineImage} - net: host - privileged: false - restart: always - healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]} - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - - /var/lib/mistral:/var/lib/mistral:ro - - /usr/share/ansible/:/usr/share/ansible/:ro - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - host_prep_tasks: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - mode: "{{ item.mode }}" - with_items: - - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' } - - name: enable virt_sandbox_use_netlink for healthcheck - seboolean: - name: virt_sandbox_use_netlink - persistent: yes - state: yes diff --git a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml deleted file mode 100644 index 705ae1dfae..0000000000 --- a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml +++ /dev/null @@ -1,116 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Mistral Event Engine service - -parameters: - ContainerMistralEventEngineImage: - description: image - type: string - ContainerMistralConfigImage: - description: The container image to use for the mistral config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - -resources: - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../database/mysql-client.yaml - - MistralBase: - type: ./mistral-base.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Mistral Event Engine role. - value: - service_name: mistral_event_engine - config_settings: - get_attr: [MistralBase, role_data, config_settings] - service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: mistral - puppet_tags: mistral_config - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::mistral - - get_attr: [MySQLClient, role_data, step_config] - config_image: {get_param: ContainerMistralConfigImage} - kolla_config: - /var/lib/kolla/config_files/mistral_event_engine.json: - command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/event-engine.log --server=event-engine - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/mistral - owner: mistral:mistral - recurse: true - docker_config: - step_4: - mistral_event_engine: - image: {get_param: ContainerMistralEventEngineImage} - net: host - privileged: false - restart: always - healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]} - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_event_engine.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - - /var/lib/mistral:/var/lib/mistral:ro - - /usr/share/ansible/:/usr/share/ansible/:ro - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - host_prep_tasks: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - mode: "{{ item.mode }}" - with_items: - - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' } - - name: enable virt_sandbox_use_netlink for healthcheck - seboolean: - name: virt_sandbox_use_netlink - persistent: yes - state: yes diff --git a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml deleted file mode 100644 index 0bf5f701b3..0000000000 --- a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml +++ /dev/null @@ -1,252 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Mistral Executor service - -parameters: - ContainerMistralExecutorImage: - description: image - type: string - DockerMistralExecutorUlimit: - default: ['nofile=1024'] - description: ulimit for Mistral Executor Container - type: comma_delimited_list - ContainerMistralConfigImage: - description: The container image to use for the mistral config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - MistralExecutorVolumes: - default: [] - description: List of additional volumes to mount into the mistral-executor container - type: comma_delimited_list - MistralExecutorExtraVolumes: - default: [] - description: List of user-provided additional volumes to mount into the mistral-executor container - type: comma_delimited_list - UndercloudConfigFilePath: - default: '' - description: Configuration file for Undercloud, needed by TripleO Validations. - type: string - ContainerCli: - type: string - default: 'podman' - description: CLI tool used to manage containers. - constraints: - - allowed_values: ['docker', 'podman'] - MistralDockerGroup: - default: false - description: Add the mistral user to the docker group to allow actions to perform docker operations. - type: boolean - TripleoAdminUser: - default: 'tripleo-admin' - description: Name of user which manages the hosts - type: string - MountBackupFilesystemPaths: - default: false - description: Set to True to mount all directories stated in BackupFilesystemPaths - type: boolean - BackupBaseMountpoint: - default: '/backup' - description: Absolute paths to directory, which will use as a base directory for all mounted directories marked for backup - type: string - BackupFilesystemPaths: - description: Absolute paths to directories, which should be included during filesystem backup on undercloud - type: json - default: - - /etc/hiera.yaml - - /etc/puppet/ - - /var/lib/config-data/ - -conditions: - docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} - mount_backup_filesystem: {equals : [{get_param: MountBackupFilesystemPaths}, true]} - -resources: - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../database/mysql-client.yaml - - MistralBase: - type: ./mistral-base.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Mistral Executor role. - value: - service_name: mistral_executor - config_settings: - map_merge: - - get_attr: [MistralBase, role_data, config_settings] - # Note: the hiera parameter will only work if the TripleO validations - # are run from Mistral Executor container. If the parameter is - # needed on the host, it'll have to be defined somewhere else too. - # The hiera param is set to the same value as the bind mound location - # of the file inside the container. - - tripleo_undercloud_conf_file: '/var/lib/mistral/undercloud.conf' - tripleo::profile::base::mistral::executor::docker_group: {get_param: MistralDockerGroup} - service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: mistral - puppet_tags: mistral_config,user,group - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::mistral::executor - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: ContainerMistralConfigImage} - volumes: - list_concat: - - - if: - - docker_enabled - - - /run/docker.sock:/run/docker.sock:rw - - null - kolla_config: - /var/lib/kolla/config_files/mistral_executor.json: - command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor - config_files: - list_concat: - - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/mistral - owner: mistral:mistral - recurse: true - - path: /var/lib/mistral - owner: mistral:mistral - recurse: true - docker_config: - step_4: - mistral_executor: - image: {get_param: ContainerMistralExecutorImage} - ulimit: {get_param: DockerMistralExecutorUlimit} - net: host - privileged: false - restart: always - healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]} - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - - /var/log/containers/mistral:/var/log/mistral:z - - /var/lib/mistral:/var/lib/mistral:z - - /usr/share/ansible/:/usr/share/ansible/:ro - - /var/lib/config-data/puppet-generated:/var/lib/config-data/puppet-generated:ro - - /usr/share/openstack-tripleo-heat-templates:/usr/share/openstack-tripleo-heat-templates:ro - - {get_param: MistralExecutorVolumes} - - {get_param: MistralExecutorExtraVolumes} - - - str_replace: - template: - '/home/tripleo-admin:/home/tripleo-admin' - params: - tripleo-admin: {get_param: TripleoAdminUser} - - if: - - mount_backup_filesystem - - repeat: - for_each: - PATH: {get_param: BackupFilesystemPaths} - template: - list_join: - - ':' - - - 'PATH' - - list_join: - - '/' - - - {get_param: BackupBaseMountpoint} - - 'PATH' - - 'ro' - expression: > - ($.data.paths + $.data.extra_plugins) - .flatten().distinct() - - - null - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - env_file: /etc/environment - host_prep_tasks: - - set_fact: - tripleo_admin_user: {get_param: TripleoAdminUser} - undercloud_cfg_file: {get_param: UndercloudConfigFilePath} - - import_role: - name: tripleo_create_admin - tasks_from: create_user.yml - vars: - tripleo_admin_generate_key: true - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - mode: "{{ item.mode|default(omit) }}" - with_items: - - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' } - - { 'path': /var/lib/mistral, 'setype': container_file_t, 'mode': '0751' } - - name: create mistral/.ssh directory - file: - path: /var/lib/mistral/.ssh - state: directory - mode: 0700 - - name: copy tripleo-admin private key to /var/lib/mistral/.ssh - copy: - remote_src: yes - src: /home/{{ tripleo_admin_user }}/.ssh/id_rsa - dest: /var/lib/mistral/.ssh/{{ tripleo_admin_user }}-rsa - mode: 0600 - - name: copy undercloud.conf to /var/lib/mistral/ - when: undercloud_cfg_file != '' - copy: - src: "{{ undercloud_cfg_file }}" - dest: /var/lib/mistral/undercloud.conf - mode: 0444 - setype: container_file_t - local_follow: true - - name: create ceph-ansible source directory - file: - path: /usr/share/ceph-ansible - state: directory - setype: container_file_t - - name: create octavia-amphora-images directory - file: - path: /usr/share/openstack-octavia-amphora-images - state: directory - setype: container_file_t - - name: enable virt_sandbox_use_netlink for healthcheck - seboolean: - name: virt_sandbox_use_netlink - persistent: yes - state: yes diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml index 7336dc714f..c75ac28618 100644 --- a/deployment/haproxy/haproxy-edge-container-puppet.yaml +++ b/deployment/haproxy/haproxy-edge-container-puppet.yaml @@ -102,7 +102,6 @@ outputs: tripleo::haproxy::keystone_admin: false tripleo::haproxy::keystone_public: false tripleo::haproxy::manila: false - tripleo::haproxy::mistral: false tripleo::haproxy::mysql: false tripleo::haproxy::neutron: false tripleo::haproxy::nova_osapi: false diff --git a/environments/services-baremetal/mistral.yaml b/environments/services-baremetal/mistral.yaml deleted file mode 100644 index fddad5fe62..0000000000 --- a/environments/services-baremetal/mistral.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# This environment is deprecated since Mistral will be removed in the future. -resource_registry: - OS::TripleO::Services::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml - OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml - OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml diff --git a/environments/services/mistral.yaml b/environments/services/mistral.yaml deleted file mode 100644 index fddad5fe62..0000000000 --- a/environments/services/mistral.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# This environment is deprecated since Mistral will be removed in the future. -resource_registry: - OS::TripleO::Services::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml - OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml - OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index 608fa41508..a129e37b70 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -30,7 +30,6 @@ parameter_defaults: KeystonePublic: {protocol: 'https', port: '13000', host: 'CLOUDNAME'} ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'} MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'} - MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} NeutronPublic: {protocol: 'https', port: '13696', host: 'CLOUDNAME'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovajoinPublic: {protocol: 'https', port: '13090', host: 'CLOUDNAME'} diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index d94452f95c..af689328e2 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -29,7 +29,6 @@ parameter_defaults: IronicInspectorPublic: {protocol: 'https', port: '13050', host: 'IP_ADDRESS'} KeystonePublic: {protocol: 'https', port: '13000', host: 'IP_ADDRESS'} ManilaPublic: {protocol: 'https', port: '13786', host: 'IP_ADDRESS'} - MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'} NeutronPublic: {protocol: 'https', port: '13696', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'IP_ADDRESS'} NovajoinPublic: {protocol: 'https', port: '13090', host: 'IP_ADDRESS'} diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index dadfb5d10f..a000c7c303 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -57,9 +57,6 @@ parameter_defaults: ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'} ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'} MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'} - MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'} - MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'} - MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} MysqlInternal: {protocol: 'mysql+pymysql', port: '3306', host: 'CLOUDNAME'} NeutronAdmin: {protocol: 'https', port: '9696', host: 'CLOUDNAME'} NeutronInternal: {protocol: 'https', port: '9696', host: 'CLOUDNAME'} diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index 231d82a34d..d2098146c7 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -93,9 +93,5 @@ resource_registry: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index db2d18da62..94bdb9e5d4 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -103,10 +103,6 @@ resource_registry: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml diff --git a/environments/storage/nova-nfs.yaml b/environments/storage/nova-nfs.yaml index f2e8bc8a5f..8f1058efec 100644 --- a/environments/storage/nova-nfs.yaml +++ b/environments/storage/nova-nfs.yaml @@ -17,7 +17,7 @@ parameter_defaults: # Type: string NovaNfsShare: '' - # NFS version used for nova storage (when NovaNfsEnabled is true). Since NFSv3 does not support full locking a NFSv4 version need to be used. To not break current installations the default is the previous hard coded version 4. + # NFS version used for nova storage (when NovaNfsEnabled is true). Since NFSv3 does not support full locking a NFSv4 version need to be used. # Type: string NovaNfsVersion: "4.2" diff --git a/environments/undercloud-enable-nova.yaml b/environments/undercloud-enable-nova.yaml index 3dceb11a76..4dd60455ae 100644 --- a/environments/undercloud-enable-nova.yaml +++ b/environments/undercloud-enable-nova.yaml @@ -22,8 +22,6 @@ parameter_defaults: compute_service_user: key: 'compute_service_user' value: 'role:admin' - MistralExecutorVolumes: - - /var/lib/config-data/nova/etc/nova:/etc/nova:ro IronicConfigureSwiftTempUrlKey: true resource_registry: diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 3a05201ee8..97802adab5 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -209,10 +209,6 @@ resource_registry: OS::TripleO::Services::MasqueradeNetworks: OS::Heat::None OS::TripleO::Services::Memcached: OS::Heat::None OS::TripleO::Services::MetricsQdr: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::Multipathd: OS::Heat::None OS::TripleO::Services::MySQL: OS::Heat::None OS::TripleO::Services::NeutronApi: OS::Heat::None diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index d7a271f114..177d005765 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -7355,390 +7355,6 @@ outputs: - EndpointMap - MetricsQdrPublic - port - MistralAdmin: - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - MistralAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - MistralApiNetwork - port: - get_param: - - EndpointMap - - MistralAdmin - - port - protocol: - get_param: - - EndpointMap - - MistralAdmin - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - MistralAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralAdmin - - port - path: /v2 - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - MistralAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralAdmin - - port - MistralInternal: - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - MistralInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - MistralApiNetwork - port: - get_param: - - EndpointMap - - MistralInternal - - port - protocol: - get_param: - - EndpointMap - - MistralInternal - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - MistralInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralInternal - - port - path: /v2 - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - MistralInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - MistralApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - MistralApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralInternal - - port - MistralPublic: - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - PublicNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - MistralPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - PublicNetwork - port: - get_param: - - EndpointMap - - MistralPublic - - port - protocol: - get_param: - - EndpointMap - - MistralPublic - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - MistralPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - PublicNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralPublic - - port - path: /v2 - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - MistralPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - MistralPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - PublicNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - MistralPublic - - port MysqlInternal: host: str_replace: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 4b9668ca67..5bb1dbcf18 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -262,10 +262,6 @@ resource_registry: OS::TripleO::Services::AodhListener: OS::Heat::None OS::TripleO::Services::AodhNotifier: OS::Heat::None OS::TripleO::Services::MetricsQdr: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None OS::TripleO::Services::IronicApi: OS::Heat::None OS::TripleO::Services::IronicConductor: OS::Heat::None OS::TripleO::Services::IronicInspector: OS::Heat::None @@ -423,7 +419,6 @@ parameter_defaults: PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }} OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - MistralApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} ZaqarApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} DockerRegistryNetwork: ctlplane PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} @@ -510,9 +505,6 @@ parameter_defaults: ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS} ManilaPublic: {protocol: http, port: '8786', host: IP_ADDRESS} MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: IP_ADDRESS} - MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS} - MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS} - MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS} MysqlInternal: {protocol: mysql+pymysql, port: '3306', host: IP_ADDRESS} NeutronAdmin: {protocol: http, port: '9696', host: IP_ADDRESS} NeutronInternal: {protocol: http, port: '9696', host: IP_ADDRESS} diff --git a/releasenotes/notes/mistral-removal-df87b8dd8bf6bd4e.yaml b/releasenotes/notes/mistral-removal-df87b8dd8bf6bd4e.yaml new file mode 100644 index 0000000000..dd8efd42c2 --- /dev/null +++ b/releasenotes/notes/mistral-removal-df87b8dd8bf6bd4e.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Mistral has been removed as it was Deprecated in Wallaby and is no longer + in use. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index f617a54cd8..f3bc161763 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -125,10 +125,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index cddf8fe768..be5cbe22f5 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -90,10 +90,6 @@ - OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronApi diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index e9a26eca0f..f65feaa147 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -113,10 +113,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 16c3adf3ed..49cd2c4e45 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -97,10 +97,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 988e4b19a6..1d7ae76803 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -96,10 +96,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::Memcached - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronApi diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index a863197123..e295cdde2e 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -118,10 +118,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 27539086b4..05ba429d2d 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -123,10 +123,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 7a00a89553..49133dfdb7 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -124,10 +124,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index c833f2171e..97a2fa3d12 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -122,10 +122,6 @@ - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralEventEngine - - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index ef0a9cefa5..37903fb0be 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -61,10 +61,6 @@ - OS::TripleO::Services::LoginDefs - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Memcached - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralEventEngine - - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles_data.yaml b/roles_data.yaml index f293ad1506..6a06923e34 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -128,10 +128,6 @@ - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index a3c9ddc477..14019a759d 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -64,10 +64,6 @@ - OS::TripleO::Services::LoginDefs - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Memcached - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralEventEngine - - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index dd8805d061..f5ce80c247 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -142,7 +142,6 @@ environments: IronicInspectorPublic: {protocol: 'https', port: '13050', host: 'IP_ADDRESS'} KeystonePublic: {protocol: 'https', port: '13000', host: 'IP_ADDRESS'} ManilaPublic: {protocol: 'https', port: '13786', host: 'IP_ADDRESS'} - MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'} NeutronPublic: {protocol: 'https', port: '13696', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'IP_ADDRESS'} NovajoinPublic: {protocol: 'https', port: '13090', host: 'IP_ADDRESS'} @@ -191,7 +190,6 @@ environments: KeystonePublic: {protocol: 'https', port: '13000', host: 'CLOUDNAME'} ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'} MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'} - MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} NeutronPublic: {protocol: 'https', port: '13696', host: 'CLOUDNAME'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovajoinPublic: {protocol: 'https', port: '13090', host: 'CLOUDNAME'} @@ -266,9 +264,6 @@ environments: ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'} ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'} MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'} - MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'} - MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'} - MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} MysqlInternal: {protocol: 'mysql+pymysql', port: '3306', host: 'CLOUDNAME'} NeutronAdmin: {protocol: 'https', port: '9696', host: 'CLOUDNAME'} NeutronInternal: {protocol: 'https', port: '9696', host: 'CLOUDNAME'} diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index ad0b2411c2..b94ee4f26f 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -123,11 +123,6 @@ environments: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - # Mistral - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None # Rear OS::TripleO::Services::Rear: OS::Heat::None # Redis @@ -234,11 +229,6 @@ environments: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - # Mistral - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None # Zaqar OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 50441ccde7..69a9f85c9d 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -193,10 +193,6 @@ environments: OS::TripleO::Services::MasqueradeNetworks: OS::Heat::None OS::TripleO::Services::Memcached: OS::Heat::None OS::TripleO::Services::MetricsQdr: OS::Heat::None - OS::TripleO::Services::MistralApi: OS::Heat::None - OS::TripleO::Services::MistralEngine: OS::Heat::None - OS::TripleO::Services::MistralEventEngine: OS::Heat::None - OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::Multipathd: OS::Heat::None OS::TripleO::Services::MySQL: OS::Heat::None OS::TripleO::Services::NeutronApi: OS::Heat::None