Make sure kubernetes starts after containerd

Change-Id: I6ed4f5040295a734a7e1a749ab43e26f3272d443

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"

Pipfile.lock

@@ -708,7 +708,8 @@
                 "sha256:cb925e1ca024d6f9b4f9b01d83215fd00fe69d095d0255ff3f64bffda74025c8",
                 "sha256:d07b01c51b0b6ceb0f09fc48ec58debd99d2c8430b09e56651addeaf5de48048",
                 "sha256:e76c7f351e0444721e85f975ae92718e21c1f361bda946d60a214061de1f00a1",
-                "sha256:eb4813b77d5df99903af4757ce980a98c4d702bbcb81f32a0b305a1537bdf0b1"
+                "sha256:eb4813b77d5df99903af4757ce980a98c4d702bbcb81f32a0b305a1537bdf0b1",
+		"sha256:63378c60583811442035b75c04bbf6858ce9255cfc79d49dae48c256f468a0ab"
             ],
             "version": "==0.11.0"
         },
@@ -865,7 +866,7 @@
         },
         "promenade": {
             "git": "https://opendev.org/airship/promenade.git",
-            "ref": "c10165c144e0a18137596a3c89f1339d6ed30d0c"
+            "ref": "b549359b9cfde648bb3b9ab38739d7a3873e0ef5"
         },
         "psycopg2-binary": {
             "hashes": [

requirements.txt

@@ -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

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

vcs-requirements.env

@@ -1,3 +1,3 @@
 DECKHAND_VERSION=commit/5cd799cc5d04527ac782270008ff647b3779ff05
 SHIPYARD_VERSION=commit/e3e71f7d1632c0dc13b436a32c238f9da76d6d88
-PROMENADE_VERSION=commit/c10165c144e0a18137596a3c89f1339d6ed30d0c
+PROMENADE_VERSION=commit/b549359b9cfde648bb3b9ab38739d7a3873e0ef5