Make sure kubernetes starts after containerd
Change-Id: I6ed4f5040295a734a7e1a749ab43e26f3272d443
This commit is contained in:
parent
770cf4256e
commit
a6d708dc6f
2
Pipfile
2
Pipfile
@ -27,7 +27,7 @@ pylibyaml = "~=0.1"
|
||||
PyYAML = "~=5.1"
|
||||
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "5cd799cc5d04527ac782270008ff647b3779ff05"}
|
||||
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "e3e71f7d1632c0dc13b436a32c238f9da76d6d88",subdirectory = "src/bin/shipyard_client"}
|
||||
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "c10165c144e0a18137596a3c89f1339d6ed30d0c"}
|
||||
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "b549359b9cfde648bb3b9ab38739d7a3873e0ef5"}
|
||||
"oslo.i18n" = "~=3.24.0"
|
||||
"oslo.utils" = ">=3.42.1"
|
||||
six = ">=1.15.0"
|
||||
|
2
Pipfile.lock
generated
2
Pipfile.lock
generated
@ -865,7 +865,7 @@
|
||||
},
|
||||
"promenade": {
|
||||
"git": "https://opendev.org/airship/promenade.git",
|
||||
"ref": "c10165c144e0a18137596a3c89f1339d6ed30d0c"
|
||||
"ref": "b549359b9cfde648bb3b9ab38739d7a3873e0ef5"
|
||||
},
|
||||
"psycopg2-binary": {
|
||||
"hashes": [
|
||||
|
@ -28,7 +28,7 @@ fixtures==3.0.0
|
||||
flake8==3.7.9
|
||||
futurist==2.2.0; python_version >= '3.6'
|
||||
git+https://opendev.org/airship/deckhand.git@5cd799cc5d04527ac782270008ff647b3779ff05#egg=deckhand
|
||||
git+https://opendev.org/airship/promenade.git@c10165c144e0a18137596a3c89f1339d6ed30d0c#egg=promenade
|
||||
git+https://opendev.org/airship/promenade.git@b549359b9cfde648bb3b9ab38739d7a3873e0ef5#egg=promenade
|
||||
git+https://opendev.org/airship/shipyard.git@e3e71f7d1632c0dc13b436a32c238f9da76d6d88#egg=shipyard-client&subdirectory=src/bin/shipyard_client
|
||||
gitpython==2.1.15
|
||||
setuptools==40.4.3
|
||||
@ -123,4 +123,4 @@ websocket-client==0.57.0
|
||||
werkzeug==0.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
|
||||
wrapt==1.12.1
|
||||
yappi==1.2.5
|
||||
zipp~=3.6.0
|
||||
zipp~=3.6.0
|
||||
|
2
tox.ini
2
tox.ini
@ -14,7 +14,7 @@ setenv =
|
||||
deps =
|
||||
pipenv
|
||||
setuptools < 58.0.0
|
||||
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
||||
passenv = http_proxy,https_proxy,HTTP_PROXY,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VERSION
|
||||
whitelist_externals =
|
||||
bash
|
||||
find
|
||||
|
@ -1,3 +1,3 @@
|
||||
DECKHAND_VERSION=commit/5cd799cc5d04527ac782270008ff647b3779ff05
|
||||
SHIPYARD_VERSION=commit/e3e71f7d1632c0dc13b436a32c238f9da76d6d88
|
||||
PROMENADE_VERSION=commit/c10165c144e0a18137596a3c89f1339d6ed30d0c
|
||||
PROMENADE_VERSION=commit/b549359b9cfde648bb3b9ab38739d7a3873e0ef5
|
||||
|
Loading…
Reference in New Issue
Block a user