diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-25 06:49:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-25 06:49:16 +0000 |
| commit | f8f132d1267be673fec02234420d61c57254e59e (patch) | |
| tree | bbdbe6b64f8c31d9bb973344be954980931e10b9 /kolla | |
| parent | 9233ca5a161d345c0c5c55bf9f692c6ed8174c0e (diff) | |
| parent | d0546485f6d16418eb645e7474965eaefc376953 (diff) | |
| download | kolla-f8f132d1267be673fec02234420d61c57254e59e.tar.gz kolla-f8f132d1267be673fec02234420d61c57254e59e.zip | |
Merge "Add networking-baremetal"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 0a51f3c72..a45f7f674 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -527,6 +527,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' 'neutron-fwaas-master.tar.gz')}, + 'neutron-base-plugin-networking-baremetal': { + 'type': 'url', + 'location': ('$tarballs_base/networking-baremetal/' + 'networking-baremetal-master.tar.gz')}, 'neutron-base-plugin-networking-generic-switch': { 'type': 'url', 'location': ('$tarballs_base/networking-generic-switch/' diff --git a/kolla/image/build.py b/kolla/image/build.py index 2ac591cf1..b1bc718d3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -111,6 +111,7 @@ SKIPPED_IMAGES = { "ec2-api", "freezer-base", "heat-all", + "ironic-neutron-agent", "karbor-base", "kuryr-base", "mistral-event-engine", @@ -141,6 +142,7 @@ SKIPPED_IMAGES = { "ec2-api", "freezer-base", "heat-all", + "ironic-neutron-agent", "karbor-base", "kuryr-base", "mistral-event-engine", |
