diff options
Diffstat (limited to 'xci')
| -rwxr-xr-x | xci/config/env-vars | 1 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 4 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 4 |
3 files changed, 0 insertions, 9 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index ba68290b..36ae97c0 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -11,7 +11,6 @@ export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git. export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git} export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server} export KEEPALIVED_GIT_URL=${KEEPALIVED_GIT_URL:-https://github.com/evrardjp/ansible-keepalived} -export OSM_DEVOPS_GIT_URL=${OSM_DEVOPS_GIT_URL:-https://osm.etsi.org/gerrit/osm/devops.git} # Configuration export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index e55b1d17..b5f5480d 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -45,7 +45,3 @@ export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') # HEAD of kubspray "master" as of 16.05.2018 export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"38e727dbe1bdf5316fae8d645718cc8279fbda20"} -# use tagged version of OSM devops repo until the integration is done -# also, this version is not OSM version. This needs to be looked into for -# specifying exact version for OSM itself. -export OSM_DEVOPS_VERSION=${OSM_DEVOPS_VERSION:-"v4.0.1"} diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index 269fc105..e7e3b76c 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -30,10 +30,6 @@ kubespray_git_url: "{{ lookup('env','KUBESPRAY_GIT_URL') }}" kubespray_version: "{{ lookup('env','KUBESPRAY_VERSION') }}" xci_kube_ansible_pip_version: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}" -# osm variables -osm_devops_git_url: "{{ lookup('env','OSM_DEVOPS_GIT_URL') }}" -osm_devops_version: "{{ lookup('env','OSM_DEVOPS_VERSION') }}" - # variables for other components keepalived_git_url: "{{ lookup('env','KEEPALIVED_GIT_URL') }}" haproxy_version: "{{ lookup('env','HAPROXY_VERSION') }}" |