From a360411cb8c775dffa24a4157cec2b566cbde6f3 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Tue, 7 Nov 2017 15:30:51 +0800 Subject: Add compass-docker-compose 1. Add ansible for docker compose containerized compass 2. deploy/conf/compass.conf no longer specify image tags for runtime. build.yaml now is added into compass tarball to be the only place determine image tags 3. This patch is based on patch: https://gerrit.opnfv.org/gerrit/#/c/47393/ use merged compass-tasks 4. Tempoarily using private docker repo for compass-tasks. Switch to opnfv repo when patch https://gerrit.opnfv.org/gerrit/#/c/47329/ is merged 5. Modify ansible callback module accrodingly Change-Id: I0728a9002a1cc7804c9e8f13bd1afdccb684a159 Signed-off-by: Harry Huang --- build/build.yaml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'build') diff --git a/build/build.yaml b/build/build.yaml index 210169e7..cb97c495 100644 --- a/build/build.yaml +++ b/build/build.yaml @@ -15,16 +15,10 @@ packages: get_method: docker url: compass4nfv/compass-deck:latest - - name: compass-tasks-osa - description: "compass task container for openstack deployment via openstack-ansible" + - name: compass-tasks + description: "compass task container integrated with openstack-ansible and kubespray" get_method: docker - url: yifei0van0xue/compass-tasks-osa:latest - - - name: compass-tasks-k8s - description: "compass task container for kubernets deployment via kargo" - get_method: docker - url: compass4nfv/compass-tasks-k8s:latest - + url: huangxiangyu/compass-tasks:latest - name: compass-cobbler description: "cobbler container for compass" @@ -50,8 +44,3 @@ packages: description: "compass repo container for deployment" get_method: docker url: compass4nfv/compass-repo-osa-ubuntu:euphrates - - - name: compass-docker-compose - description: "containerized compass compose ansible" - get_method: git - url: https://github.com/yifei-xue/compass-docker-compose.git -- cgit 1.2.3-korg