Description of problem:
Overcloud deploy fails when including roles_data.yaml template complaining about OS::TripleO::Services::ManilaApi not being found.

Version-Release number of selected component (if applicable):
10 from CDN

How reproducible:
100%

Steps to Reproduce:
1. Deploy overcloud with below command and attached templates
2. Deployment fails in servicechain steps complaining about resource not being found

Actual results:
Overcloud deploy fails with below message:

 u'message': u"Failed to run action [action_ex_id=399e121e-f3a1-4ba2-8d59-502626350aeb, action_cls='<class 'mistral.actions.action_factory.DeployStackAction'>', attributes='{}', params='{u'container': u'overcloud', u'timeout': 60}']\n ERROR: Failed to validate: : resources.ControllerServiceChain: : The Resource Type (OS::Tripleo::Services::ManilaApi) could not be found.",
 u'status': u'FAILED'}

Expected results:
Overcloud deploy should proceed with manila resources being found.

Additional info:

Deploy command:
time openstack overcloud deploy \
--templates \
-r ~/templates/roles_data.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
-e ~/templates/storage-environment.yaml \
-e ~/templates/network-environment.yaml \
-e ~/templates/firstboot/firstboot.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/services/ironic.yaml \
-e ~/templates/ironic.yaml \
--control-scale 1 \
--compute-scale 1 \
--ceph-storage-scale 0 \
--compute-flavor compute \
--control-flavor control \
--ceph-storage-flavor ceph-storage \
--timeout 60 \
--ntp-server time.google.com \
--libvirt-type qemu