openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Drop mistral configuration from post deploy"

Browse Source
This commit is contained in:
Zuul 2021-06-21 17:29:21 +00:00 committed by Gerrit Code Review
commit 14aa81dd73
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extraconfig/post_deploy/undercloud_post.py
View File

@ -16,12 +16,7 @@ import openstack
import os import os
import subprocess import subprocess
from mistralclient.api import client as mistralclient
CONF = json.loads(os.environ['config']) CONF = json.loads(os.environ['config'])
WORKBOOK_PATH = '/usr/share/openstack-tripleo-common/workbooks'
THT_DIR = '/usr/share/openstack-tripleo-heat-templates'
def _run_command(args, env=None, name=None): def _run_command(args, env=None, name=None):
@ -93,35 +88,11 @@ def _create_default_keypair(sdk):
public_key=pub_key_file.read()) public_key=pub_key_file.read())
def _configure_workbooks_and_workflows(mistral):
for workbook in [w for w in mistral.workbooks.list()
if w.name.startswith('tripleo')]:
mistral.workbooks.delete(workbook.name)
managed_tag = 'tripleo-common-managed'
all_workflows = mistral.workflows.list()
workflows_delete = [w.name for w in all_workflows
if managed_tag in w.tags]
# in order to delete workflows they should have no triggers associated
for trigger in [t for t in mistral.cron_triggers.list()
if t.workflow_name in workflows_delete]:
mistral.cron_triggers.delete(trigger.name)
for workflow_name in workflows_delete:
mistral.workflows.delete(workflow_name)
for workbook in [f for f in os.listdir(WORKBOOK_PATH)
if os.path.isfile(os.path.join(WORKBOOK_PATH, f))]:
mistral.workbooks.create(os.path.join(WORKBOOK_PATH, workbook))
print('INFO: Undercloud post - Mistral workbooks configured successfully.')
nova_api_enabled = 'true' in _run_command( nova_api_enabled = 'true' in _run_command(
['hiera', 'nova_api_enabled']).lower() ['hiera', 'nova_api_enabled']).lower()
mistral_api_enabled = 'true' in _run_command(
['hiera', 'mistral_api_enabled']).lower()
if not nova_api_enabled: if not nova_api_enabled:
print('WARNING: Undercloud Post - Nova API is disabled.') print('WARNING: Undercloud Post - Nova API is disabled.')
if not mistral_api_enabled:
print('WARNING: Undercloud Post - Mistral API is disabled.')
sdk = openstack.connect(CONF['cloud_name']) sdk = openstack.connect(CONF['cloud_name'])
@ -129,10 +100,6 @@ try:
if nova_api_enabled: if nova_api_enabled:
_configure_nova(sdk) _configure_nova(sdk)
_create_default_keypair(sdk) _create_default_keypair(sdk)
if mistral_api_enabled:
mistral = mistralclient.client(mistral_url=sdk.workflow.get_endpoint(),
session=sdk.session)
_configure_workbooks_and_workflows(mistral)
except Exception: except Exception:
print('ERROR: Undercloud Post - Failed.') print('ERROR: Undercloud Post - Failed.')
raise raise

4
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -159,10 +159,6 @@ resources:
JSON: JSON:
cloud_name: {get_param: UndercloudCloudName} cloud_name: {get_param: UndercloudCloudName}
home_dir: {get_param: UndercloudHomeDir} home_dir: {get_param: UndercloudHomeDir}
snmp_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
undercloud_db_password: {get_param: MysqlRootPassword}
undercloud_db_host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
UndercloudCtlplaneNetworkConfig: UndercloudCtlplaneNetworkConfig:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig