From 4a0f595d02beb91c36ce277450ca5c0de56e3ee3 Mon Sep 17 00:00:00 2001
From: ahothan <ahothan@cisco.com>
Date: Wed, 23 May 2018 00:25:55 -0700
Subject: [PATCH] Fix build issue caused by pip error (10.0.1)

Change-Id: Ie36d8d5068c4a6dd3d2efc1c4adcb6ab723c4f06
---
 Dockerfile                                                  | 1 +
 kb_dib/elements/kloudbuster/post-install.d/01-pip-package   | 1 +
 kb_dib/elements/kloudbuster/post-install.d/99-cloudcfg-edit | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9ca8aa0..41b982f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y \
        python-dev \
        python-pip \
     && pip install -U -q pip \
+    && hash -r pip \
     && pip install -U -q setuptools \
     && cd /kloudbuster \
     && pip install -q -e . \
diff --git a/kb_dib/elements/kloudbuster/post-install.d/01-pip-package b/kb_dib/elements/kloudbuster/post-install.d/01-pip-package
index 3e9b608..2e83415 100755
--- a/kb_dib/elements/kloudbuster/post-install.d/01-pip-package
+++ b/kb_dib/elements/kloudbuster/post-install.d/01-pip-package
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 pip install --upgrade pip
+hash -r pip
 pip install setuptools wheel
diff --git a/kb_dib/elements/kloudbuster/post-install.d/99-cloudcfg-edit b/kb_dib/elements/kloudbuster/post-install.d/99-cloudcfg-edit
index c17fe08..dc51030 100755
--- a/kb_dib/elements/kloudbuster/post-install.d/99-cloudcfg-edit
+++ b/kb_dib/elements/kloudbuster/post-install.d/99-cloudcfg-edit
@@ -5,7 +5,7 @@ cloudcfg = "/etc/cloud/cloud.cfg"
 user = "cloud-user"
 
 with open(cloudcfg) as f:
-  cfg = safe_yaml.load(f)
+  cfg = yaml.safe_load(f)
 
 try:
   if cfg['system_info']['default_user']['name']: