Fixing an idempotency problem found in testing.

This commit is contained in:
Matt Bruzek 2015-08-06 15:56:23 -05:00
parent e3579ccb17
commit d024013970

View File

@ -64,7 +64,10 @@ def clone_repository():
""" """
repository = 'https://github.com/GoogleCloudPlatform/kubernetes.git' repository = 'https://github.com/GoogleCloudPlatform/kubernetes.git'
kubernetes_directory = '/opt/kubernetes' kubernetes_directory = path('/opt/kubernetes')
# Since we can not clone twice, check for the directory and remove it.
if kubernetes_directory.isdir():
kubernetes_directory.rmtree_p()
command = ['git', 'clone', repository, kubernetes_directory] command = ['git', 'clone', repository, kubernetes_directory]
print(command) print(command)
@ -75,8 +78,8 @@ def clone_repository():
def install_packages(): def install_packages():
""" """
Install required packages to build the k8s source, and syndicate between Install required packages to build the k8s source, and syndicate between
minion nodes. In addition, fetch pip to handle python dependencies minion nodes. In addition, fetch pip to handle python dependencies
""" """
hookenv.log('Installing Debian packages') hookenv.log('Installing Debian packages')
# Create the list of packages to install. # Create the list of packages to install.
@ -87,8 +90,8 @@ def install_packages():
def update_rc_files(strings): def update_rc_files(strings):
""" """
Preseed the bash environment for ubuntu and root with K8's env vars to Preseed the bash environment for ubuntu and root with K8's env vars to
make interfacing with the api easier. (see: kubectrl docs) make interfacing with the api easier. (see: kubectrl docs)
""" """
rc_files = [path('/home/ubuntu/.bashrc'), path('/root/.bashrc')] rc_files = [path('/home/ubuntu/.bashrc'), path('/root/.bashrc')]
for rc_file in rc_files: for rc_file in rc_files: