diff options
| author |   Vikas Varma <vv8305@att.com> | 2019-04-30 21:12:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-30 21:12:25 +0000 |
| commit | 7e459e2f5cdd50e85a3242b9400d561b83647af1 (patch) | |
| tree | 27c1e896c33cdb5e493b4c13c61cbf1a4db8f769 /cmso-optimizer | |
| parent | 2e9516b12bcaf79d66fcf0734dd8f35083bebb35 (diff) | |
| parent | 0d920e8d8e85f712dd1799f8682357afe43819e3 (diff) | |
Merge "Updates to enable local HTTPS testing"
Diffstat (limited to 'cmso-optimizer')
| -rw-r--r-- | cmso-optimizer/etc/config/optimizer.properties | 20 | ||||
| -rw-r--r-- | cmso-optimizer/etc/config/org.onap.oof.jks | bin | 0 -> 3711 bytes | |||
| -rw-r--r-- | cmso-optimizer/etc/config/truststoreONAPall.jks | bin | 0 -> 117990 bytes |
3 files changed, 13 insertions, 7 deletions
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 diff --git a/cmso-optimizer/etc/config/org.onap.oof.jks b/cmso-optimizer/etc/config/org.onap.oof.jks Binary files differnew file mode 100644 index 0000000..535abaa --- /dev/null +++ b/cmso-optimizer/etc/config/org.onap.oof.jks diff --git a/cmso-optimizer/etc/config/truststoreONAPall.jks b/cmso-optimizer/etc/config/truststoreONAPall.jks Binary files differnew file mode 100644 index 0000000..ff844b1 --- /dev/null +++ b/cmso-optimizer/etc/config/truststoreONAPall.jks |