diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-07-21 11:43:27 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-07-21 11:53:32 -0400 |
| commit | e85f0404bad5acbed980e163a9e702dc5823a21c (patch) | |
| tree | 3dde98d865b01f93c53efe3062969b41667e277e | |
| parent | 9f1fbcb40a030d40b3241b6684fd554e12732dd1 (diff) | |
Cleans up exec workaround for ODL container clustering
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>
| -rw-r--r-- | docker/services/opendaylight-api.yaml | 7 | ||||
| -rw-r--r-- | releasenotes/notes/cleanup-odl-clustering-93a3ec132f3c2343.yaml | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index 80ca822b..6a62f65e 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -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: diff --git a/releasenotes/notes/cleanup-odl-clustering-93a3ec132f3c2343.yaml b/releasenotes/notes/cleanup-odl-clustering-93a3ec132f3c2343.yaml new file mode 100644 index 00000000..01ce1758 --- /dev/null +++ b/releasenotes/notes/cleanup-odl-clustering-93a3ec132f3c2343.yaml @@ -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. |