diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-14 21:35:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-14 21:35:18 +0000 |
| commit | 8bf9e8a90ce94880c351e96634c82ce04f86d5b1 (patch) | |
| tree | 67010ccb649a088f55e2dc9def2f254bad13ca83 /kolla | |
| parent | 2e14723419097f894a2d2255df0eec6670b4d630 (diff) | |
| parent | 69aa2ab56e50c2c07dbbd79f0710788a272d1874 (diff) | |
| download | kolla-8bf9e8a90ce94880c351e96634c82ce04f86d5b1.tar.gz kolla-8bf9e8a90ce94880c351e96634c82ce04f86d5b1.zip | |
Merge "Remove ec2-api image"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 35a1facf5..8df0d9bbd 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -93,7 +93,6 @@ _PROFILE_OPTS = [ 'blazar', 'cloudkitty', 'designate', - 'ec2-api', 'freezer', 'gnocchi', 'influxdb', @@ -324,10 +323,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/designate/' 'designate-${openstack_branch}.tar.gz')}, - 'ec2-api': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/ec2-api/' - 'ec2-api-${openstack_branch}.tar.gz')}, 'freezer-api': { 'type': 'url', 'location': ('$tarballs_base/openstack/freezer-api/' diff --git a/kolla/image/build.py b/kolla/image/build.py index eed4fb27a..2172cb4be 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -162,7 +162,6 @@ UNBUILDABLE_IMAGES = { 'debian+binary': { "cloudkitty-base", - "ec2-api", "ironic-neutron-agent", "nova-serialproxy", "senlin-conductor", # no binary package @@ -173,7 +172,6 @@ UNBUILDABLE_IMAGES = { 'ubuntu+binary': { "cloudkitty-base", - "ec2-api", "ironic-neutron-agent", "rally", "senlin-conductor", # no binary package |