From fccff019a632dfcde7dbf29f559ec36045590fe8 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Thu, 16 Mar 2017 11:00:02 +0000 Subject: [PATCH] Change heat cfn service description While in openstack deployment guides use Orchestration as heat-cfn description, heat devstack plugin uses CloudFormation. I think is more accurate and easier to know which service is. Change-Id: I760c7e7baa46da57fd2fca9d5409f370a0c9065c Closes-Bug: #1673421 --- ansible/roles/heat/tasks/register.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index cdb0d6819b..3d5adfdd9a 100644 --- a/ansible/roles/heat/tasks/register.yml +++ b/ansible/roles/heat/tasks/register.yml @@ -5,7 +5,7 @@ module_args: service_name: "{{ item.service_name }}" service_type: "{{ item.service_type }}" - description: "Openstack Orchestration" + description: "{{ item.description }}" endpoint_region: "{{ openstack_region_name }}" url: "{{ item.url }}" interface: "{{ item.interface }}" @@ -15,12 +15,12 @@ openstack_heat_auth: "{{ openstack_heat_auth }}" run_once: True with_items: - - {'interface': 'admin', 'url': '{{ heat_admin_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration'} - - {'interface': 'internal', 'url': '{{ heat_internal_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration'} - - {'interface': 'public', 'url': '{{ heat_public_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration'} - - {'interface': 'admin', 'url': '{{ heat_cfn_admin_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation'} - - {'interface': 'internal', 'url': '{{ heat_cfn_internal_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation'} - - {'interface': 'public', 'url': '{{ heat_cfn_public_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation'} + - {'interface': 'admin', 'url': '{{ heat_admin_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration', 'description': 'OpenStack Orchestration'} + - {'interface': 'internal', 'url': '{{ heat_internal_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration', 'description': 'OpenStack Orchestration'} + - {'interface': 'public', 'url': '{{ heat_public_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration', 'description': 'OpenStack Orchestration'} + - {'interface': 'admin', 'url': '{{ heat_cfn_admin_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation', 'description': 'OpenStack CloudFormation'} + - {'interface': 'internal', 'url': '{{ heat_cfn_internal_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation', 'description': 'OpenStack CloudFormation'} + - {'interface': 'public', 'url': '{{ heat_cfn_public_endpoint }}', 'service_name': 'heat-cfn', 'service_type': 'cloudformation', 'description': 'OpenStack CloudFormation'} - name: Creating the Heat project, user, and role kolla_toolbox: