summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/files
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-05 17:55:25 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-06 16:20:20 +0400
commitc1889c963bbe9b21645057e6e9cfcbe9c5f6434d (patch)
treed2a979a71b0467fcacc0e2c8a3a8e77d05c247a7 /mcp/salt-formulas/opendaylight/files
parent7f47d25bc3a25ad2cdd564100cdc703ae85702b4 (diff)
Update opendaylight version to oxygen
JIRA: FUEL-362 Change-Id: Ib2621bca72d1ba376af5d369edcf5fcf37e9788b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight/files')
-rw-r--r--mcp/salt-formulas/opendaylight/files/jetty.xml33
-rw-r--r--mcp/salt-formulas/opendaylight/files/setenv.shell1
2 files changed, 1 insertions, 33 deletions
diff --git a/mcp/salt-formulas/opendaylight/files/jetty.xml b/mcp/salt-formulas/opendaylight/files/jetty.xml
index e6371883a..de2ac677d 100644
--- a/mcp/salt-formulas/opendaylight/files/jetty.xml
+++ b/mcp/salt-formulas/opendaylight/files/jetty.xml
@@ -84,7 +84,7 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
<Property name="jetty.host"/>
</Set>
<Set name="port">
- <Property name="jetty.port" default="8181"/>
+ <Property name="jetty.port" default="{{ server.odl_rest_port }}"/>
</Set>
<Set name="idleTimeout">
<Property name="http.timeout" default="300000"/>
@@ -94,37 +94,6 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
</Arg>
</Call>
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server">
- <Ref refid="Server" />
- </Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config">
- <Ref refid="http-legacy" />
- </Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="host">{{ server.odl_bind_ip }}
- <Property name="jetty.host"/>
- </Set>
- <Set name="port">
- <Property name="jetty.port" default="{{ server.odl_rest_port }}"/>
- </Set>
- <Set name="idleTimeout">
- <Property name="http.timeout" default="300000"/>
- </Set>q
- <Set name="name">jetty-legacy</Set>
- </New>
- </Arg>
- </Call>
-
<!-- =========================================================== -->
<!-- Configure Authentication Realms -->
<!-- Realms may be configured for the entire server here, or -->
diff --git a/mcp/salt-formulas/opendaylight/files/setenv.shell b/mcp/salt-formulas/opendaylight/files/setenv.shell
index d7dfbd96c..2921ade14 100644
--- a/mcp/salt-formulas/opendaylight/files/setenv.shell
+++ b/mcp/salt-formulas/opendaylight/files/setenv.shell
@@ -19,4 +19,3 @@ export EXTRA_JAVA_OPTS='{{ server.java_extra_opts }}' # Additional JVM options
# export KARAF_OPTS # Additional available Karaf options
# export KARAF_DEBUG # Enable debug mode
# export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start
-