From 0d920e8d8e85f712dd1799f8682357afe43819e3 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Tue, 30 Apr 2019 13:31:09 -0400 Subject: Updates to enable local HTTPS testing Issue-ID: OPTFRA-391 Change-Id: I4826a4ecc7f33d7062f3cd2850c349fbc4f1ec84 Signed-off-by: Jerry Flood --- cmso-optimizer/etc/config/optimizer.properties | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'cmso-optimizer/etc/config/optimizer.properties') diff --git a/cmso-optimizer/etc/config/optimizer.properties b/cmso-optimizer/etc/config/optimizer.properties index 132408e..9e089fe 100644 --- a/cmso-optimizer/etc/config/optimizer.properties +++ b/cmso-optimizer/etc/config/optimizer.properties @@ -43,20 +43,26 @@ logging.level.org.hibernate.SQL=WARN logging.level.org.hibernate=WARN -healthcheck.cmso.topology.url=http://127.0.0.1:7998/topology/v1/health?checkInterfaces=true -healthcheck.cmso.ticketmgt.url=http://127.0.0.1:7999/ticketmgt/v1/health?checkInterfaces=true +## +## Update etc/hosts to match. Will work with https configured +## 127.0.0.1 oof-cmso-ticketmgt oof-cmso-topology oof-cmso-optimizer oof-cmso +## +healthcheck.cmso.topology.url=https://oof-cmso-topology:7998/topology/v1/health?checkInterfaces=true +healthcheck.cmso.ticketmgt.url=https://oof-cmso-ticketmgt:7999/ticketmgt/v1/health?checkInterfaces=true healthcheck.cmso.topology.title="CMSO Topology Interface" healthcheck.cmso.ticketmgt.title="CMSO Ticket Management Interface" -cmso.topology.create.request.url=http://127.0.0.1:7998/topology/v1/current -cmso.ticket.create.request.url=http://127.0.0.1:7999/ticketmgt/v1/activetickets +cmso.topology.create.request.url=https://oof-cmso-topology:7998/topology/v1/current +cmso.ticket.create.request.url=https://oof-cmso-topology:7999/ticketmgt/v1/activetickets cmso.local.policy.folder=data/policies ## MacOS - minizinc IDE has solvers built in -cmso.minizinc.command.exe=/Applications/MiniZincIDE.app/Contents/Resources/minizinc +##cmso.minizinc.command.exe=/Applications/MiniZincIDE.app/Contents/Resources/minizinc + ## Windows -##cmso.minizinc.command.exe="C:/Program Files/MiniZinc IDE (bundled)/minizinc.exe" +cmso.minizinc.command.exe="C:/Program Files/MiniZinc IDE (bundled)/minizinc.exe" +cmso.minizinc.command.commandline=cmd.exe /C scripts\\minizinc\\run.bat + cmso.minizinc.command.solver=OSICBC cmso.minizinc.command.timelimit=60000 cmso.minizinc.command.mzn=scripts/minizinc/generic_attributes.mzn -###cmso.minizinc.command.commandline=cmd.exe /C scripts\\minizinc\\run.bat \ No newline at end of file -- cgit 1.2.3-korg