Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit c5fe309

Browse files
author
ljuaneda
committed
Update datastore.pp
replaced ::ipaddress by openshift_origin::node_ip_addr so that we can specify in our manifest on which network interface to mongo service should be bind.
1 parent 1124541 commit c5fe309

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

manifests/datastore.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
if $openshift_origin::mongodb_replica_primary {
8181
exec { 'replset-init':
8282
path => ['/bin/', '/usr/bin/', '/usr/sbin/'],
83-
command => "mongo admin -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval printjson\"(rs.initiate({ _id: \'${openshift_origin::mongodb_replica_name}\', members: [ { _id: 0, host: \'${::ipaddress}:${port}\' } ] }))\"",
84-
unless => "mongo admin --host ${::ipaddress} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.status())\" | grep '\"name\" : \"${::ipaddress}:${port}\"'",
83+
command => "mongo admin -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval printjson\"(rs.initiate({ _id: \'${openshift_origin::mongodb_replica_name}\', members: [ { _id: 0, host: \'${openshift_origin::node_ip_addr}:${port}\' } ] }))\"",
84+
unless => "mongo admin --host ${openshift_origin::node_ip_addr} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.status())\" | grep '\"name\" : \"${openshift_origin::node_ip_addr}:${port}\"'",
8585
tries => 3,
8686
try_sleep => 5,
8787
require => [
@@ -94,8 +94,8 @@
9494
# Only run the replset-add command if we are not in the middle of instantiating multiple hosts at once.
9595
exec { 'replset-add':
9696
path => ['/bin/', '/usr/bin/', '/usr/sbin/'],
97-
command => "mongo admin --host ${openshift_origin::mongodb_replica_primary_ip_addr} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.add(\'${::ipaddress}:${port}\'))\"",
98-
unless => "mongo admin --host ${openshift_origin::mongodb_replica_primary_ip_addr} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.status())\" | grep '\"name\" : \"${::ipaddress}:${port}\"'",
97+
command => "mongo admin --host ${openshift_origin::mongodb_replica_primary_ip_addr} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.add(\'${openshift_origin::node_ip_addr}:${port}\'))\"",
98+
unless => "mongo admin --host ${openshift_origin::mongodb_replica_primary_ip_addr} -u ${openshift_origin::mongodb_admin_user} -p ${openshift_origin::mongodb_admin_password} --quiet --eval \"printjson(rs.status())\" | grep '\"name\" : \"${openshift_origin::node_ip_addr}:${port}\"'",
9999
tries => 6,
100100
try_sleep => 30,
101101
require => [

0 commit comments

Comments
 (0)