Browse code
Removed pycadf version enforcement
Proper cap is in requirements [1] and both affected projects (keystone
[2] and nova [3]), so removing the hack from devstack.
[1]: I824c5cd9a1fa8252acf2a000cf1f645f302be0b7
[2]: Ie64bd740f55b89e992724aa195841b07d7b66dbc
[3]: I5cf5df1ecea3a0db1a7503c0689acbb3bc8ffd58
Change-Id: I52aab6adf494b3c2f020daf636bb72602139dc8f
Ihar Hrachyshka authored on 2015/01/27 18:23:54Showing 2 changed files
| ... | ... |
@@ -427,10 +427,6 @@ function install_keystone {
|
| 427 | 427 |
if is_apache_enabled_service key; then |
| 428 | 428 |
install_apache_wsgi |
| 429 | 429 |
fi |
| 430 |
- |
|
| 431 |
- # FIXME(dtroyer): Work around a pycadf release that breaks icehouse |
|
| 432 |
- # Remove once a proper cap is in requirements.txt |
|
| 433 |
- pip_install 'pycadf==0.6.0' |
|
| 434 | 430 |
} |
| 435 | 431 |
|
| 436 | 432 |
# start_keystone() - Start running processes, including screen |
| ... | ... |
@@ -692,10 +692,6 @@ function install_nova {
|
| 692 | 692 |
git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH |
| 693 | 693 |
setup_develop $NOVA_DIR |
| 694 | 694 |
sudo install -D -m 0644 -o $STACK_USER {$NOVA_DIR/tools/,/etc/bash_completion.d/}nova-manage.bash_completion
|
| 695 |
- |
|
| 696 |
- # FIXME(dtroyer): Work around a pycadf release that breaks icehouse |
|
| 697 |
- # Remove once a proper cap is in requirements.txt |
|
| 698 |
- pip_install 'pycadf==0.6.0' |
|
| 699 | 695 |
} |
| 700 | 696 |
|
| 701 | 697 |
# start_nova_api() - Start the API process ahead of other things |