RHOSP13- R5.0-162: contrail heat plugin is missing in heat-engine docker

[alok kumar]

heat test is failing in sanity and the reason seems to be missing contrail heat plugin.

In centos deployment, we have 'plugin_dirs' set to '/opt/plugin/site-packages/vnc_api/gen/heat/resources' and '/opt/plugin/site-packages/contrail_heat/resources' in heat.conf but in RHOSP13 setup I don't see it set to this value and /opt directory is also empty.

()[heat@overcloud-controller-1 /]$ grep plugin_dirs /etc/heat/heat.conf
#plugin_dirs = /usr/lib64/heat,/usr/lib/heat,/usr/local/lib/heat,/usr/local/lib64/heat

[root@overcloud-controller-1 heat-admin]# docker ps -a|grep heat
4d5256b4f8f2 192.168.24.1:8787/rhosp13/openstack-heat-api-cfn:13.0-45 "kolla_start" 4 days ago Up 4 days (healthy) heat_api_cfn
4cab72631580 192.168.24.1:8787/rhosp13/openstack-heat-api:13.0-46 "kolla_start" 4 days ago Up 4 days heat_api_cron
a86bf1ac6b8d 192.168.24.1:8787/rhosp13/openstack-heat-engine:13.0-44 "kolla_start" 4 days ago Up 4 days (healthy) heat_engine
f4ade54f3b87 192.168.24.1:8787/rhosp13/openstack-heat-api:13.0-46 "kolla_start" 4 days ago Up 4 days (healthy) heat_api
2f6edd8a54b2 192.168.24.1:8787/contrail-openstack-heat-init:rhel-queens-5.0-162 "/entrypoint.sh" 4 days ago Exited (0) 4 days ago contrail_heat_plugin
039891397e22 192.168.24.1:8787/rhosp13/openstack-heat-engine:13.0-44 "/usr/bin/bootstra..." 4 days ago Exited (0) 4 days ago heat_engine_db_sync
e82a4797845d 192.168.24.1:8787/rhosp13/openstack-heat-engine:13.0-44 "/bin/bash -c 'cho..." 4 days ago Exited (0) 4 days ago heat_init_log
[root@overcloud-controller-1 heat-admin]#

[alexey-mr (alexey-morlang)]

This should be fixed in the latest build (for this bug commits from the bug https://bugs.launchpad.net/juniperopenstack/+bug/1782251 are enough)

[alexey-mr (alexey-morlang)]

This Change-Id: I4790a6f1d86f4c96f62f7139b1feb9b9639d1ff0

[alexey-mr (alexey-morlang)]

Additionally the change is needed from the tripleo side: https://review.openstack.org/#/c/577737/

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/45344
Submitter: alexey-mr (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/45348
Submitter: alexey-mr (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/45344
Submitter: alexey-mr (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/45344
Committed: http://github.com/Juniper/contrail-tripleo-heat-templates/commit/35373245a9ded23a47b895bd8e3cc582501e6a0a
Submitter: Zuul v3 CI (<email address hidden>)
Branch: stable/queens

commit 35373245a9ded23a47b895bd8e3cc582501e6a0a
Author: alexey-mr <email address hidden>
Date: Tue Aug 7 13:56:00 2018 +0300

Reworked contrail heat plugin init

- the plugin is to be added to heat engine instead of api
iIt is done as in contrail-kolla-ansible)
- plugins dirs is passed via appropriate tht parameter
- To have it works the following patch in tripleo is
needed as well
https://review.openstack.org/#/c/577737/1/docker/services/heat-engine.yaml

Change-Id: I050069aafc75511be1fbfd6fd46caaac8dc031da
Closes-Bug: #1785611

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/45348
Committed: http://github.com/Juniper/contrail-tripleo-puppet/commit/77d86feefb90a0d967eab5f8c3e6388281322caf
Submitter: Zuul v3 CI (<email address hidden>)
Branch: stable/queens

commit 77d86feefb90a0d967eab5f8c3e6388281322caf
Author: alexey-mr <email address hidden>
Date: Tue Aug 7 17:57:31 2018 +0300

Removed plugins_dirs

Plugin dirs is configured via THT parameter now
https://review.opencontrail.org/#/c/45344/

Change-Id: I59c47f18674c6b53fcd8832bbfc878c9dd9c4e18
Partial-Bug: #1785611

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/49327
Submitter: alexey-mr (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/49327
Committed: http://github.com/Juniper/contrail-tripleo-puppet/commit/7f0c7ccc70a75f25fefa3a73b382a9dcdde5034e
Submitter: Zuul v3 CI (<email address hidden>)
Branch: master

commit 7f0c7ccc70a75f25fefa3a73b382a9dcdde5034e
Author: alexey-mr <email address hidden>
Date: Tue Aug 7 17:57:31 2018 +0300

Removed plugins_dirs

Plugin dirs is configured via THT parameter now
https://review.opencontrail.org/#/c/45344/

Change-Id: I59c47f18674c6b53fcd8832bbfc878c9dd9c4e18
Partial-Bug: #1785611