Merge "Removal mistral" into stable/wallaby

This commit is contained in:
Zuul 2021-10-06 23:13:22 +00:00 committed by Gerrit Code Review
commit 890c4b2b8a
14 changed files with 0 additions and 141 deletions

View File

@ -56,7 +56,6 @@ _SUPPORTED_USERS['kolla']='kolla 42400 42400'
_SUPPORTED_USERS['libvirt']='libvirt 42473 42473'
_SUPPORTED_USERS['manila']='manila 42429 42429 /var/lib/manila kolla'
_SUPPORTED_USERS['memcached']='memcached 42457 42457 /run/memcache kolla'
_SUPPORTED_USERS['mistral']='mistral 42430 42430 /var/lib/mistral kolla'
_SUPPORTED_USERS['mysql']='mysql 42434 42434 /var/lib/mysql kolla'
_SUPPORTED_USERS['neutron']='neutron 42435 42435 /var/lib/neutron kolla'
_SUPPORTED_USERS['nfast']='nfast 42481 42481'

View File

@ -1,11 +0,0 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-api /openstack/healthcheck && chmod a+rx /openstack/healthcheck
tcib_packages:
common:
- httpd
- mod_ssl
- openstack-mistral-api
- python3-mod_wsgi
tcib_user: mistral

View File

@ -1,9 +0,0 @@
tcib_actions:
- run: bash /usr/local/bin/uid_gid_manage mistral
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
tcib_packages:
common:
- openstack-mistral-common
- openstack-tripleo-common
- python3-shade
- python3dist\(ansible\)

View File

@ -1,7 +0,0 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-engine /openstack/healthcheck && chmod a+rx /openstack/healthcheck
tcib_packages:
common:
- openstack-mistral-engine
tcib_user: mistral

View File

@ -1,7 +0,0 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-event-engine /openstack/healthcheck && chmod a+rx /openstack/healthcheck
tcib_packages:
common:
- openstack-mistral-event-engine
tcib_user: mistral

View File

@ -1,13 +0,0 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-executor /openstack/healthcheck && chmod a+rx /openstack/healthcheck
- run: test -f /usr/bin/ansible-playbook-3 || ln -s /usr/bin/ansible-playbook /usr/bin/ansible-playbook-3
tcib_packages:
common:
- ipmitool
- openstack-mistral-executor
- openstack-nova-common
- openstack-tripleo-heat-templates
- python3-novajoin
- qemu-img
tcib_user: mistral

View File

@ -95,14 +95,6 @@ container_images:
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-memcached:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-mistral-api:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-mistral-engine:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-mistral-executor:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-mistral-event-engine:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-multipathd:current-tripleo
image_source: tripleo
- imagename: quay.io/tripleowallaby/openstack-neutron-dhcp-agent:current-tripleo

View File

@ -418,38 +418,6 @@ container_images_template:
services:
- OS::TripleO::Services::Memcached
- imagename: "{{namespace}}/{{name_prefix}}mistral-api{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerMistralApiImage
- ContainerMistralConfigImage
services:
- OS::TripleO::Services::MistralApi
- OS::TripleO::Services::MistralEngine
- OS::TripleO::Services::MistralExecutor
- OS::TripleO::Services::MistralEventEngine
- imagename: "{{namespace}}/{{name_prefix}}mistral-engine{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerMistralEngineImage
services:
- OS::TripleO::Services::MistralEngine
- imagename: "{{namespace}}/{{name_prefix}}mistral-executor{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerMistralExecutorImage
services:
- OS::TripleO::Services::MistralExecutor
- imagename: "{{namespace}}/{{name_prefix}}mistral-event-engine{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
- ContainerMistralEventEngineImage
services:
- OS::TripleO::Services::MistralEventEngine
- imagename: "{{namespace}}/{{name_prefix}}multipathd{{name_suffix}}:{{tag}}"
image_source: tripleo
params:

View File

@ -1,6 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-mistral_wsgi.conf)
healthcheck_curl ${check_url}

View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='mistral-server'
args="${@:-5671 5672}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
exit 1
fi

View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='mistral-server'
args="${@:-5671 5672}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
exit 1
fi

View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
process='mistral-server'
args="${@:-5671 5672}"
if healthcheck_port $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
exit 1
fi

View File

@ -109,7 +109,6 @@ PASSWORD_PARAMETER_NAMES = (
'KeystoneFernetKey1',
'KeystoneFernetKeys',
'ManilaPassword',
'MistralPassword',
'MysqlClustercheckPassword',
'MysqlRootPassword',
'NeutronMetadataProxySharedSecret',
@ -212,8 +211,6 @@ ANSIBLE_ERRORS_FILE = 'ansible-errors.json'
DEPLOYMENT_STATUS_FILE = 'deployment_status.yaml'
MISTRAL_WORK_DIR = '/var/lib/mistral'
EXCLUSIVE_NEUTRON_DRIVERS = ['ovn', 'openvswitch']
DEFAULT_STEPS_MAX = 6

View File

@ -75,7 +75,6 @@ CAPABILITIES_DICT = {
_EXISTING_PASSWORDS = {
'PlacementPassword': 'VFJeqBKbatYhQm9jja67hufft',
'MistralPassword': 'VFJeqBKbatYhQm9jja67hufft',
'BarbicanPassword': 'MGGQBtgKT7FnywvkcdMwE9nhx',
'BarbicanSimpleCryptoKek': 'dGhpcnR5X3R3b19ieXRlX2tleWJsYWhibGFoYmxhaGg=',
'AdminPassword': 'jFmY8FTpvtF2e4d4ReXvmUP8k',
@ -450,7 +449,6 @@ class PlanTest(base.TestCase):
}
mock_orchestration.resources.get.return_value = mock_resource
rotate_list = [
'MistralPassword',
'BarbicanPassword',
'AdminPassword',
'CeilometerMeteringSecret',