diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-11-17 14:53:44 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-12-21 16:36:30 +0800 |
| commit | 8646b8d62cf4ca7b6bccae537a0c9e72ba45eab3 (patch) | |
| tree | 73a9a983e0dd1423e9df928a78a5023a09d5a7f9 /compass-tasks-k8s | |
| parent | 6234176ae292a75dcda5520324cb7857d6105988 (diff) | |
Merge compass-tasks-osa and compass-tasks-k8s
JIRA: COMPASS-568
rename compass-tasks to compass-tasks-base.
add both osa and k8s support in compass-tasks
Change-Id: I438f5b17e509d4cb751ced0ffe640ec70899882f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'compass-tasks-k8s')
| -rw-r--r-- | compass-tasks-k8s/Dockerfile | 8 | ||||
| -rw-r--r-- | compass-tasks-k8s/README.md | 1 | ||||
| -rw-r--r-- | compass-tasks-k8s/run.sh | 25 |
3 files changed, 0 insertions, 34 deletions
diff --git a/compass-tasks-k8s/Dockerfile b/compass-tasks-k8s/Dockerfile deleted file mode 100644 index cd74cf8..0000000 --- a/compass-tasks-k8s/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM opnfv/compass-tasks:latest -#FROM localbuild/compass-tasks - -ARG BRANCH=master - -ADD ./run.sh /root/ -RUN chmod +x /root/run.sh -RUN /root/run.sh diff --git a/compass-tasks-k8s/README.md b/compass-tasks-k8s/README.md deleted file mode 100644 index 2dab2ee..0000000 --- a/compass-tasks-k8s/README.md +++ /dev/null @@ -1 +0,0 @@ -# compass-tasks-k8s diff --git a/compass-tasks-k8s/run.sh b/compass-tasks-k8s/run.sh deleted file mode 100644 index 516ead0..0000000 --- a/compass-tasks-k8s/run.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -x -COMPASS_DIR=${BASH_SOURCE[0]%/*} - -rm -rf /opt/kargo_k8s -git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s - -cd /opt/kargo_k8s -git checkout v2.2.0 - -pip uninstall ansible -y - -pip install ansible==2.3.1.0 - - - - |