Skip to content

Commit

Permalink
Heat configuration for the contrail-heat plugin
Browse files Browse the repository at this point in the history
1. group_vars/all.yml: Add a new variable (enable_heat_opencontrail - defaults to "yes") to
enable/disable the contrail heat plugin.
2. heat.conf.j2: Add contrail specific configurations to heat.conf to enable the
plugin if the knob is enabled

Change-Id: Ib49611932d150fb02677f366e2b9b0815a4e6dd3
Closes-bug: #1714233
  • Loading branch information
ramprackash committed Sep 1, 2017
1 parent e3a6a91 commit 7e08b06
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
4 changes: 4 additions & 0 deletions kolla-ansible/ansible/group_vars/all.yml
Expand Up @@ -13,6 +13,10 @@ enable_nova_compute: "yes"
# neutron plugin. "no" means pure openstack neutron - without contrail neutron plugin
enable_neutron_opencontrail: "yes"

# contrail_additions : Ideally leave this to yes if you want the opencontrail
# heat plugin. "no" means pure openstack heat - without contrail heat plugin
enable_heat_opencontrail: "yes"

# contrail_additions : IP address where contrail-api is listening on - on an
# all-in-one, it will be same as kolla_internal_vip_address
contrail_api_interface_address: "{{ kolla_internal_vip_address }}"
Expand Down
14 changes: 14 additions & 0 deletions kolla-ansible/ansible/roles/heat/templates/heat.conf.j2
Expand Up @@ -3,6 +3,10 @@ debug = {{ heat_logging_debug }}

log_dir = /var/log/kolla/heat

{% if enable_heat_opencontrail | bool %}
plugin_dirs = /usr/lib/python2.7/dist-packages/vnc_api/gen/heat/resources,/usr/lib/python2.7/dist-packages/contrail_heat/resources
{% endif %}

heat_watch_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}
heat_metadata_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}
heat_waitcondition_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}/v1/waitcondition
Expand Down Expand Up @@ -89,3 +93,13 @@ driver = noop

[clients]
endpoint_type = internalURL

{% if enable_heat_opencontrail | bool %}
[clients_contrail]
user = admin
password = {{ keystone_admin_password }}
tenant = admin
api_server = {{ contrail_api_interface_address }}
api_base_url = /
auth_host_ip = {{ kolla_internal_vip_address }}
{% endif %}

0 comments on commit 7e08b06

Please sign in to comment.