Bug 1540263

Description of problem:
Following our docs https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/12/html-single/bare_metal_provisioning/#sect-deploying-the-overcloud I have deployed OSP12 with overcloud Ironic. I've noticed that environments/services/ironic.yaml deploys containerized Ironic services while I'd expect to have it done via environments/services-docker/ironic.yaml. Not sure if that's on purpose to enforce all the deployments running containers. However there is one line missing in environments/services/ironic.yaml which exist in environments/services-docker/ironic.yaml:

[root@director environments]# diff -u services/ironic.yaml services-docker/ironic.yaml 
--- services/ironic.yaml        2017-11-30 15:46:20.000000000 -0500
+++ services-docker/ironic.yaml 2017-11-03 16:20:12.000000000 -0400
@@ -1,6 +1,7 @@
 resource_registry:
   OS::TripleO::Services::IronicApi: ../../docker/services/ironic-api.yaml
   OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
+  OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
   OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
 parameter_defaults:
   NovaSchedulerDiscoverHostsInCellsInterval: 15

In result Overcloud Ironic deployed following our official docs is missing IronicPxe service. We should either fix environment files or update docs to point to use environments/services-docker/ironic.yaml instead of environments/services/ironic.yaml. 


Version-Release number of selected component (if applicable):
[root@director ~]# rpm -qa | grep -i tripleo
python-tripleoclient-7.3.3-7.el7ost.noarch
openstack-tripleo-ui-7.4.3-4.el7ost.noarch
openstack-tripleo-image-elements-7.0.1-1.el7ost.noarch
puppet-tripleo-7.4.3-11.el7ost.noarch
openstack-tripleo-common-7.6.3-8.el7ost.noarch
openstack-tripleo-common-containers-7.6.3-8.el7ost.noarch
openstack-tripleo-validations-7.4.2-1.el7ost.noarch
openstack-tripleo-puppet-elements-7.0.1-2.el7ost.noarch
openstack-tripleo-heat-templates-7.0.3-18.el7ost.noarch


How reproducible:
All the time if following downstream docs.

Steps to Reproduce:
1) Follow https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/12/html-single/bare_metal_provisioning to deploy overcloud BMaaS
2) Run deployment including /usr/share/openstack-tripleo-heat-templates/environments/services/ironic.yaml as docs say, instead of using /usr/share/openstack-tripleo-heat-templates/environments/services-docker/ironic.yaml
3) Find out that there is no IronicPxe service listening on :8088 on the controller node

Actual results:
No IronicPxe service, cannot use BMaaS.

Expected results:
All required services for BMaaS are up and running.

Additional info:
Upstream docs differentiate use of services and services-docker templates:
https://docs.openstack.org/tripleo-docs/latest/install/advanced_deployment/baremetal_overcloud.html#deployment

To deploy Ironic in containers (starting with the Pike release), use /usr/share/openstack-tripleo-heat-templates/environments/services-docker/ironic.yaml instead.