Skip to content

Commit

Permalink
add onegate_endpoint parameter
Browse files Browse the repository at this point in the history
This allows for setting the full onegate endpoint in oned.conf (needed
if using https proxy, etc). If specified this param will override the
onegate_ip param. Note this param does not change onegate conf, just the
value of ONEGATE_ENDPOINT in oned.conf
  • Loading branch information
John Noss authored and Felix Gilcher committed Oct 11, 2016
1 parent bb8e963 commit 5c8ccdc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@
$hook_scripts = $one::params::hook_scripts,
$inherit_datastore_attrs = $one::params::inherit_datastore_attrs,
$oned_onegate_ip = $one::params::oned_onegate_ip,
$oned_onegate_endpoint = $one::params::oned_onegate_endpoint,
$kickstart_network = $one::params::kickstart_network,
$kickstart_partition = $one::params::kickstart_partition,
$kickstart_rootpw = $one::params::kickstart_rootpw,
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@

# Todo: Use Serviceip from HA-Setup if ha enabled.
$oned_onegate_ip = hiera('one::oned::onegate::ip', $::ipaddress)
# Specify full endpoint if needed (such as if using https proxy)
$oned_onegate_endpoint = hiera('one::oned::onegate::endpoint', undef)

# E-POST imaginator parameters
$kickstart_network = hiera ('one::node::kickstart::network', undef)
Expand Down
6 changes: 4 additions & 2 deletions templates/oned.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -899,8 +899,10 @@ DEFAULT_UMASK = 177
# MUST be consistent with the values in onegate-server.conf
#*******************************************************************************

<% if scope.lookupvar('one::oned_onegate_ip') -%>
ONEGATE_ENDPOINT = "<%= scope.lookupvar('one::oned_onegate_ip') %>:5030"
<% if scope.lookupvar('one::oned_onegate_endpoint') -%>
ONEGATE_ENDPOINT = "<%= scope.lookupvar('one::oned_onegate_endpoint') %>"
<% elsif scope.lookupvar('one::oned_onegate_ip') -%>
ONEGATE_ENDPOINT = "http://<%= scope.lookupvar('one::oned_onegate_ip') %>:5030"
<% else -%>
#ONEGATE_ENDPOINT = "http://frontend:5030"
<% end -%>
Expand Down

0 comments on commit 5c8ccdc

Please # to comment.