Add back the support for V1 resources

heat-engine will now support them during startup

Change-Id: I74012127a2a2dec7b6f61e7018e96599c643cfad
Partial-Bug: 1488676

contrail_provisioning/openstack/scripts/heat-server-setup.sh

@@ -135,7 +135,7 @@ for svc in heat; do
     openstack-config --set /etc/$svc/$svc.conf DEFAULT rabbit_host $AMQP_SERVER
     openstack-config --set /etc/$svc/$svc.conf DEFAULT rabbit_port $AMQP_PORT
     PYDIST=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-    openstack-config --set /etc/$svc/$svc.conf DEFAULT plugin_dirs ${PYDIST}/vnc_api/gen/heat/resources
+    openstack-config --set /etc/$svc/$svc.conf DEFAULT plugin_dirs ${PYDIST}/vnc_api/gen/heat/resources,${PYDIST}/contrail_heat/resources
     openstack-config --set /etc/$svc/$svc.conf DEFAULT heat_waitcondition_server_url http://$controller_ip:8000/v1/waitcondition
 
     openstack-config --set /etc/$svc/$svc.conf keystone_authtoken auth_uri http://$controller_ip:5000/v2.0