diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-01 10:14:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-01 10:14:35 +0000 |
| commit | 6e2130fdad328ac3604fd4fc594de206e97a8cc2 (patch) | |
| tree | c893d323d4d3945da1c7898f02ab60ab88e55b9f /contrib/template-override | |
| parent | c89ed0842948e4afa2b100a542e804706f3217db (diff) | |
| parent | 7129203bdb46b290f92d51a8efb5709eb66ea078 (diff) | |
| download | kolla-6e2130fdad328ac3604fd4fc594de206e97a8cc2.tar.gz kolla-6e2130fdad328ac3604fd4fc594de206e97a8cc2.zip | |
Merge "ODL installed for source images"
Diffstat (limited to 'contrib/template-override')
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index 3e2e70085..b4c864b9d 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -5,7 +5,7 @@ ADD plugins-archive / RUN pip --no-cache-dir install /plugins/* {% endblock %} -{% block opendaylight_source_install %} +{% block opendaylight_install %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set opendaylight_packages = ['java-1.8.0-openjdk'] %} {% elif base_distro in ['ubuntu', 'debian'] %} |