httpd restarts take time from the deployment

[Juan Antonio Osorio Robles]

The fact that not all services add their configuration to the catalog at the same time makes puppet restart apache unnecessarily.

While some services add the apache configs to the catalog in step 3, others do it in step 4.

In order to avoid restarts, we need to make sure those are added at the same time.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/476119
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=ad14f23c112922399b96601806da34ad045cbf22
Submitter: Jenkins
Branch: master

commit ad14f23c112922399b96601806da34ad045cbf22
Author: Juan Antonio Osorio Robles <email address hidden>
Date: Wed Jun 21 15:43:25 2017 +0300

    Always start httpd at the same time

    Puppet wipes out whatever is not in it's resource catalog each run for
    httpd. This causes httpd to restart if in the next step there are
    reasources added that were not there earlier.

    This patch, thus changes the instances of httpd to start at the same
    time: On step 3 for the bootstrap node, and on step 4 for every other
    node.

    Closes-Bug: #1699502
    Change-Id: I3d29728c1ab7bd5b78100f89e00e5fa082f97b0c
    Co-Authored-By: Alex Schultz <email address hidden>

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 7.2.0 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/493754

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/493754
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=ff56fb5110b937bda5cfdf560258b74199fd6367
Submitter: Jenkins
Branch: stable/ocata

commit ff56fb5110b937bda5cfdf560258b74199fd6367
Author: Juan Antonio Osorio Robles <email address hidden>
Date: Wed Jun 21 15:43:25 2017 +0300

    Always start httpd at the same time

    Puppet wipes out whatever is not in it's resource catalog each run for
    httpd. This causes httpd to restart if in the next step there are
    reasources added that were not there earlier.

    This patch, thus changes the instances of httpd to start at the same
    time: On step 3 for the bootstrap node, and on step 4 for every other
    node.

     Conflicts:
     manifests/profile/base/heat/api.pp
     manifests/profile/base/heat/api_cfn.pp
     manifests/profile/base/heat/api_cloudwatch.pp
     manifests/profile/base/horizon.pp
     manifests/profile/base/zaqar.pp

    Closes-Bug: #1699502
    Change-Id: I3d29728c1ab7bd5b78100f89e00e5fa082f97b0c
    Co-Authored-By: Alex Schultz <email address hidden>
    (cherry picked from commit ad14f23c112922399b96601806da34ad045cbf22)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 6.5.1 release.