From df64912152bf3b24742a2279c656a658a31f7af3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 16 Dec 2019 22:12:41 -0500 Subject: [PATCH] Revert "Added for support for generating overcloud clouds.yaml" This has been replaced by Ansible. This reverts commit 0a8fc376cdbd7973cb84290cd7a4fa670e12e4d6. Change-Id: I286c71edf120e11d8e51c792e6078dc60147f026 (cherry picked from commit ba9560467862c5d801b80d1d641dc6eca81836e1) --- ...d-cloud-yaml-support-fae7585c46eda8e8.yaml | 8 ------- tripleoclient/v1/mock_clouds_yaml.py | 3 --- tripleoclient/workflows/deployment.py | 22 ------------------- 3 files changed, 33 deletions(-) delete mode 100644 releasenotes/notes/overcloud-cloud-yaml-support-fae7585c46eda8e8.yaml delete mode 100644 tripleoclient/v1/mock_clouds_yaml.py diff --git a/releasenotes/notes/overcloud-cloud-yaml-support-fae7585c46eda8e8.yaml b/releasenotes/notes/overcloud-cloud-yaml-support-fae7585c46eda8e8.yaml deleted file mode 100644 index 54c541e86..000000000 --- a/releasenotes/notes/overcloud-cloud-yaml-support-fae7585c46eda8e8.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -features: - - | - OpenStack overcloud services cli and api is currently accessed through - overcloudrc and clouds.yaml. - This adds support for overcloud clouds.yaml file generation after - deployment. The file can be found at ~/.config/openstack/clouds.yaml - and /etc/openstack/clouds.yaml. diff --git a/tripleoclient/v1/mock_clouds_yaml.py b/tripleoclient/v1/mock_clouds_yaml.py deleted file mode 100644 index e1e704d27..000000000 --- a/tripleoclient/v1/mock_clouds_yaml.py +++ /dev/null @@ -1,3 +0,0 @@ -def create_clouds_yaml(cloud=None, cloud_yaml_dir=None, - user_id=None, group_id=None): - pass diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 737b730a3..8bfc4ecb4 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -135,28 +135,6 @@ def create_overcloudrc(clients, **workflow_input): payload.get('message'))) -def create_cloudsyaml(clients, **workflow_input): - workflow_client = clients.workflow_engine - tripleoclients = clients.tripleoclient - - with tripleoclients.messaging_websocket() as ws: - execution = base.start_workflow( - workflow_client, - 'tripleo.deployment.v1.createcloudsyaml', - workflow_input=workflow_input - ) - - for payload in base.wait_for_messages(workflow_client, ws, execution): - # the workflow will return the overcloud cloud yaml data, an error - # message or blank. - if payload.get('status') == 'SUCCESS': - return payload.get('message') - else: - raise exceptions.WorkflowServiceError( - 'Exception creating overcloud clouds.yaml file: {}'.format( - payload.get('message'))) - - def get_overcloud_hosts(stack, ssh_network): ips = [] role_net_ip_map = utils.get_role_net_ip_map(stack)