diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-18 08:28:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-18 08:28:47 +0000 |
| commit | ab012d30439946d73defb8530828a9a7822c504b (patch) | |
| tree | c429d7966424eeae9f1c41b6620b338eb561604d /kolla | |
| parent | 86b6a3c558e514dcdaf122aab5ecbe170fa0bda9 (diff) | |
| parent | 49dc670eb41f9b3e872c74250493c729de95ede6 (diff) | |
| download | kolla-ab012d30439946d73defb8530828a9a7822c504b.tar.gz kolla-ab012d30439946d73defb8530828a9a7822c504b.zip | |
Merge "Add support for deploying Monasca Thresh"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 9 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 4f0dd345f..97fa1eddd 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -526,6 +526,15 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/monasca-statsd/' 'monasca-statsd-master.tar.gz')}, + # FIXME(dszumski): Use openstack tar when infra is fixed + 'monasca-thresh': { + 'type': 'url', + 'location': ('https://github.com/openstack/monasca-thresh/archive/' + 'master.tar.gz')}, + 'monasca-thresh-additions-monasca-common': { + 'type': 'url', + 'location': ('$tarballs_base/monasca-common/' + 'monasca-common-master.tar.gz')}, 'murano-base': { 'type': 'url', 'location': ('$tarballs_base/murano/' diff --git a/kolla/image/build.py b/kolla/image/build.py index b19807291..782837799 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -86,6 +86,7 @@ SKIPPED_IMAGES = { "karbor-base", "kuryr-base", "monasca-base", + "monasca-thresh", "neutron-bgp-dragent", "nova-mksproxy", "ovsdpdk", @@ -118,6 +119,7 @@ SKIPPED_IMAGES = { "kuryr-base", "mistral-event-engine", "monasca-base", + "monasca-thresh", "nova-mksproxy", "novajoin-base", "octavia-base", @@ -157,6 +159,7 @@ SKIPPED_IMAGES = { "kuryr-base", "mistral-event-engine", "monasca-base", + "monasca-thresh", "nova-mksproxy", "novajoin-base", "octavia-base", @@ -183,6 +186,7 @@ SKIPPED_IMAGES = { "karbor-base", "kuryr-base", "monasca-base", + "monasca-thresh", "nova-mksproxy", "neutron-bgp-dragent", "ovsdpdk", |
