diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-04 01:53:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-04 01:53:16 +0000 |
| commit | 0bcfd70d7b740d569476a54c7e3d4c2540c09059 (patch) | |
| tree | 5c802f6c7ff8f40c785a5e4a1d66a4d7e3724c06 | |
| parent | 0128cf6ab6b26f31e170b61f38baeb17402b8ad4 (diff) | |
| parent | b396395df47a48eab5bb905286f4865f255e5363 (diff) | |
| download | kolla-0bcfd70d7b740d569476a54c7e3d4c2540c09059.tar.gz kolla-0bcfd70d7b740d569476a54c7e3d4c2540c09059.zip | |
Merge "Temporary remove gnocchi from kolla-compose & functional tests"
| -rw-r--r-- | tests/test_images.py | 5 | ||||
| -rwxr-xr-x | tools/kolla-compose | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/test_images.py b/tests/test_images.py index 8ef97fd19..9dbf72b8c 100644 --- a/tests/test_images.py +++ b/tests/test_images.py @@ -45,7 +45,10 @@ class ImagesTest(base.BaseTestCase): "kollaglue/centos-rdo-swift-container", "kollaglue/centos-rdo-swift-account", "kollaglue/centos-rdo-rhel-osp-base", - "kollaglue/centos-rdo-barbican"] + "kollaglue/centos-rdo-barbican", + "kollaglue/centos-rdo-gnocchi-base", + "kollaglue/centos-rdo-gnocchi-api", + "kollaglue/centos-rdo-gnocchi-statsd"] results = eval(line) diff --git a/tools/kolla-compose b/tools/kolla-compose index 4df9ea4db..eeb99bfc5 100755 --- a/tools/kolla-compose +++ b/tools/kolla-compose @@ -46,7 +46,8 @@ function process_all { process cinder-backup process cinder-volume process ceilometer - process gnocchi + # TODO(coolsvap) add again with resolution for #LP1478145 + #process gnocchi } function check_selinux { |