diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-07-10 15:30:04 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-07-12 13:20:04 +0400 |
| commit | bf9afae3f5beccf284eac384b9135673af4afd67 (patch) | |
| tree | fb9ff11a8795ba7aacff77db5ef8e9119816e7db /mcp/salt-formulas | |
| parent | 2ed3a56ae4865514ba099773616df96865a0ca32 (diff) | |
Update OpenDaylight version to Neon
Change-Id: I6cbbceb9b4a88f527d8dd800b0650f31a3dc1364
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas')
3 files changed, 4 insertions, 8 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml index 3b57ea332..3554d786e 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml @@ -13,7 +13,7 @@ classes: - service.haproxy.proxy.single parameters: _param: - opendaylight_version: fluorine + opendaylight_version: neon cluster_vip_address: ${_param:opendaylight_service_host} keepalived_vip_virtual_router_id: 199 keepalived_vip_password: ${_param:opnfv_main_password} @@ -25,8 +25,6 @@ parameters: version: ${_param:opendaylight_version} repo: 'odl-team/${_param:opendaylight_version}' cluster_enabled: true - logging: - engine: syslog keepalived: cluster: vrrp_scripts: diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml index 82c141e87..36736be0a 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml @@ -10,11 +10,9 @@ applications: - opendaylight parameters: _param: - opendaylight_version: fluorine + opendaylight_version: neon opendaylight: server: enabled: 'True' version: ${_param:opendaylight_version} repo: 'odl-team/${_param:opendaylight_version}' - logging: - engine: syslog diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls index 175108ef3..1f322c53f 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls @@ -52,5 +52,5 @@ opendaylight_repo: # https://github.com/saltstack/salt/pull/45224 # - ppa: {{ server.repo }} - human_name: opendaylight-ppa - - 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 + - name: deb http://ppa.launchpad.net/{{ server.repo }}/ubuntu {{ grains.oscodename }} main + - file: /etc/apt/sources.list.d/odl-team-{{ server.version }}.list |