vrouter namespace has an incorrect colocation constraint with the ntp server on a haproxy node

Hello I checked the ntp_ocf.pp file and I see that the first and second parameters look "okay" - it matches the

https://github.com/openstack/fuel-library/blob/master/deployment/puppet/cluster/manifests/dns_ocf.pp#L46-L51

input appreciated.

Are we looking in the same repo?

ntp_ocf:
  pcmk_colocation { 'ntp-with-vrouter-ns' :
    ensure => 'present',
    score => 'INFINITY',
    first => "clone_p_$service_name",
    second => "clone_p_vrouter",
  }

dns_ocf:
 pcmk_colocation { 'dns-with-vrouter-ns' :
    ensure => 'present',
    score => 'INFINITY',
    first => "clone_p_vrouter",
    second => "clone_${service_name}",
  }

Resulting config in cib:
      <rsc_colocation id="ntp-with-vrouter-ns" rsc="clone_p_vrouter" score="INFINITY" with-rsc="clone_p_ntp"/>
      <rsc_colocation id="dns-with-vrouter-ns" rsc="clone_p_dns" score="INFINITY" with-rsc="clone_p_vrouter"/>

dns_ocf is the correct one

thank you for the clarification. Working on the solution.

Fix proposed to branch: master
Review: https://review.openstack.org/303117

Reviewed: https://review.openstack.org/303117
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=b60f2a17facf99cf4701a0a7657ba992a9b0478d
Submitter: Jenkins
Branch: master

commit b60f2a17facf99cf4701a0a7657ba992a9b0478d
Author: stewie925 <email address hidden>
Date: Thu Apr 7 16:12:30 2016 -0700

    switch ntp server vrouter namespace colocation constraints

    * Changed the ntp_ocf.pp file and cluster_ntp_ocf_spec.rb files
    * to switch the 'first' and 'second' parameter values

    Change-Id: I8c88ac59d8679590db8061c87d19a87870f9432f
    Closes-Bug: #1567646

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/315629

Reviewed: https://review.openstack.org/315629
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=b20e4b55ef0c8f3dcaada910346780e1001c823f
Submitter: Jenkins
Branch: stable/mitaka

commit b20e4b55ef0c8f3dcaada910346780e1001c823f
Author: stewie925 <email address hidden>
Date: Thu Apr 7 16:12:30 2016 -0700

    switch ntp server vrouter namespace colocation constraints

    * Changed the ntp_ocf.pp file and cluster_ntp_ocf_spec.rb files
    * to switch the 'first' and 'second' parameter values

    Change-Id: I8c88ac59d8679590db8061c87d19a87870f9432f
    Closes-Bug: #1567646
    (cherry picked from commit b60f2a17facf99cf4701a0a7657ba992a9b0478d)

Verified on #465. Passed.