diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-09 18:48:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-09 18:48:14 +0000 |
| commit | 20de635a813e0b1ccc37162f00ba4908e8d4663e (patch) | |
| tree | 90b679f77bd6e92bec553d76b9ad365d7683857c /mcp/salt-formulas/opendaylight/files | |
| parent | 2881499fa1eb9fe2d99d17ab82911d579079b567 (diff) | |
| parent | e3a3c672308953bec50e506f5f9d5ee8a73a0d0e (diff) | |
Merge "Update opendaylight version to oxygen" into stable/fraser
Diffstat (limited to 'mcp/salt-formulas/opendaylight/files')
| -rw-r--r-- | mcp/salt-formulas/opendaylight/files/jetty.xml | 33 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/files/setenv.shell | 1 |
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 - |