diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 17:31:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 17:31:59 +0000 |
| commit | 775a1c1b25c824f66c449f049e48de239c27a266 (patch) | |
| tree | 5b49799257f781ff6aa6d899408bc5ce4f3da302 /docker/services | |
| parent | 86621ff34a9c719cd68d61154a7987d491176038 (diff) | |
| parent | e85f0404bad5acbed980e163a9e702dc5823a21c (diff) | |
Merge "Cleans up exec workaround for ODL container clustering"
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/opendaylight-api.yaml | 7 |
1 files changed, 2 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: |