diff options
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 | ||||
| -rwxr-xr-x | mcp/config/states/opendaylight | 4 | ||||
| -rw-r--r-- | mcp/metadata/service/opendaylight/server/single.yml | 4 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/client.sls | 38 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/files/jetty.xml | 33 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/files/setenv.shell | 1 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/map.jinja | 8 | ||||
| -rw-r--r-- | mcp/salt-formulas/opendaylight/server.sls | 5 |
9 files changed, 11 insertions, 86 deletions
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index 76b893eae..0bd3a1307 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 @@ -23,8 +23,8 @@ cluster: {%- if conf.MCP_VCP %} - virtual_control_plane {%- endif %} - - openstack_ha - opendaylight + - openstack_ha - networks virtual: nodes: diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index 260e1bacb..f52eaf5aa 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -9,9 +9,9 @@ cluster: domain: mcp-pike-odl-noha.local states: + - opendaylight - openstack_noha - neutron_gateway - - opendaylight - networks virtual: nodes: diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index ae25ffcf4..1dd220e89 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -19,7 +19,3 @@ function odl() { salt -I 'opendaylight:server' state.sls opendaylight wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'" -salt -I 'opendaylight:server' service.restart opendaylight - -# settle down neutron api and agents -sleep 180 diff --git a/mcp/metadata/service/opendaylight/server/single.yml b/mcp/metadata/service/opendaylight/server/single.yml index b714809b3..3a762b39a 100644 --- a/mcp/metadata/service/opendaylight/server/single.yml +++ b/mcp/metadata/service/opendaylight/server/single.yml @@ -9,8 +9,12 @@ applications: - opendaylight parameters: + _param: + version: oxygen opendaylight: server: enabled: 'True' + version: ${_param:version} + repo: 'odl-team/${_param:version}' logging: engine: syslog diff --git a/mcp/salt-formulas/opendaylight/client.sls b/mcp/salt-formulas/opendaylight/client.sls deleted file mode 100644 index dba51b399..000000000 --- a/mcp/salt-formulas/opendaylight/client.sls +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -{%- from "opendaylight/map.jinja" import client with context %} -{%- if client.get('enabled', True) %} - -opendaylight_client_packages: - pkg.installed: - - pkgs: {{ client.pkgs }} - -{%- if pillar.linux.network.bridge is defined and pillar.linux.network.bridge == 'openvswitch' %} -ovs_set_manager: - cmd.run: - - name: "ovs-vsctl set-manager {{ client.ovsdb_server_iface }} {{ client.ovsdb_odl_iface }}" - - unless: "ovs-vsctl get-manager | grep -Fx {{ client.ovsdb_odl_iface }}" - -ovs_set_tunnel_endpoint: - cmd.run: - - name: "ovs-vsctl set Open_vSwitch . other_config:local_ip={{ client.tunnel_ip }}" - - unless: "ovs-vsctl get Open_vSwitch . other_config | fgrep local_ip" - - require: - - cmd: ovs_set_manager - -{%- if client.provider_mappings is defined %} -ovs_set_provider_mapping: - cmd.run: - - name: "ovs-vsctl set Open_vSwitch . other_config:provider_mappings={{ client.provider_mappings }}" - - unless: "ovs-vsctl get Open_vSwitch . other_config | fgrep provider_mappings" - - require: - - cmd: ovs_set_manager -{%- endif %} - -{%- endif %} -{%- endif %} 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 - diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja index 9e9df1dc1..38575111e 100644 --- a/mcp/salt-formulas/opendaylight/map.jinja +++ b/mcp/salt-formulas/opendaylight/map.jinja @@ -11,7 +11,7 @@ 'karaf_features': {'default': ['standard', 'wrap', 'ssh']}, 'odl_rest_port': '8282', 'odl_bind_ip': '0.0.0.0', - 'repo': 'odl-team/nitrogen', + 'repo': 'odl-team/oxygen', 'log_levels': {}, 'enable_ha': false, 'ha_node_ips': [], @@ -26,9 +26,3 @@ 'repo': 'opendaylight-6-testing' }, }, merge=salt['pillar.get']('opendaylight:server')) %} - -{%- set client = salt['grains.filter_by']({ - 'Debian': { - 'pkgs': ['python-networking-odl'], - }, -}, merge=salt['pillar.get']('opendaylight:client')) %} diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index e70931301..069dc2780 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -29,8 +29,8 @@ opendaylight_repo: # https://github.com/saltstack/salt/pull/45224 # - ppa: {{ server.repo }} - human_name: opendaylight-ppa - - name: deb http://ppa.launchpad.net/odl-team/nitrogen/ubuntu xenial main - - file: /etc/apt/sources.list.d/odl-team-ubuntu-nitrogen-xenial.list + - name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main + - file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list opendaylight: pkg.installed: @@ -78,6 +78,7 @@ opendaylight: ini.options_present: - sections: org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }} + org.osgi.service.http.port: {{ server.odl_rest_port }} {%- if server.get('router_enabled', false) %} /opt/opendaylight/etc/custom.properties: |