openstack/tripleo-heat-templates
Code Issues Proposed changes

Cleans up exec workaround for ODL container clustering

Browse Source 
Now that ODL clustering is fixed to not use an exec by:
https://git.opendaylight.org/gerrit/#/c/60491
We no longer need to use the workaround puppet-tripleo
tag to configure clustering.

Change-Id: I21c1eb2eff6d4cb855eff4a1122f55ad625d84cc
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2017-07-21 11:43:27 -04:00
parent 9f1fbcb40a
commit e85f0404ba
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/services/opendaylight-api.yaml
View File

@ -61,15 +61,12 @@ outputs:
map_merge:
- get_attr: [OpenDaylightBase, role_data, config_settings]
step_config: &step_config
list_join:
- "\n"
- - get_attr: [OpenDaylightBase, role_data, step_config]
- "include tripleo::profile::base::neutron::opendaylight::create_cluster"
get_attr: [OpenDaylightBase, role_data, step_config]
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: opendaylight
# 'file,concat,file_line,augeas' are included by default
puppet_tags: odl_user,tripleo::profile::base::neutron::opendaylight::configure_cluster
puppet_tags: odl_user
step_config: *step_config
config_image: {get_param: DockerOpendaylightConfigImage}
kolla_config:

6
releasenotes/notes/cleanup-odl-clustering-93a3ec132f3c2343.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- Deprecate and remove configuring clustering for
OpenDaylight container using an exec.
Configuration is now handled via puppet-opendaylight
using file resources.