aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/build.yaml6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl1
2 files changed, 3 insertions, 4 deletions
diff --git a/build/build.yaml b/build/build.yaml
index 88eec9e2..50602dbe 100644
--- a/build/build.yaml
+++ b/build/build.yaml
@@ -18,17 +18,17 @@ packages:
- name: compass-deck
description: "RESTful API and DB Handlers for Compass"
get_method: docker
- url: opnfv/compass-deck:latest
+ url: compass4nfv/compass-deck:7.0.0
- name: compass-tasks-osa
description: "compass task container integrated with openstack-ansible"
get_method: docker
- url: opnfv/compass-tasks-osa:latest
+ url: compass4nfv/compass-tasks-osa:7.0.0
- name: compass-tasks-k8s
description: "compass task container integrated with kubespray"
get_method: docker
- url: opnfv/compass-tasks-k8s:latest
+ url: compass4nfv/compass-tasks-k8s:7.0.0
- name: compass-cobbler
description: "cobbler container for compass"
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl
index 871850b3..202f86bb 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl
@@ -62,7 +62,6 @@ run_dir: $getVar('run_dir', '')
enable_secgroup: $getVar('enable_secgroup', True)
enable_fwaas: $getVar('enable_fwaas', True)
enable_vpnaas: $getVar('enable_vpnaas', True)
-odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
ha_network: $getVar('ha_network', 'Disable')
onos_nic: $getVar('onos_nic', 'eth2')
onos_sfc: $getVar('onos_sfc', 'Disable')