update ovsdpdk versions.yaml

Update versions.yaml file with contents from abandoned change
https://gerrit.akraino.org/r/#/c/regional_controller/+/736/

Signed-off-by: davidplunkett <dp7642@att.com>
Change-Id: Ie0e09f081795bd0ae011cac9d062188af5ac0e83

diff --git a/site_type/ovsdpdk/airship-treasuremap/global/v4.0/software/config/versions.yaml b/site_type/ovsdpdk/airship-treasuremap/global/v4.0/software/config/versions.yaml
index b074da6..858cd6f 100644 (file)
--- a/site_type/ovsdpdk/airship-treasuremap/global/v4.0/software/config/versions.yaml
+++ b/site_type/ovsdpdk/airship-treasuremap/global/v4.0/software/config/versions.yaml
@@ -227,9 +227,14 @@ data:
         reference: 332a3da0054e154c003256107a0907774531df79
       neutron:
         type: git
-        location: https://git.openstack.org/openstack/openstack-helm
+        location: https://review.opendev.org/openstack/openstack-helm
         subpath: neutron
-        reference: 332a3da0054e154c003256107a0907774531df79
+        reference: refs/changes/84/643284/9
+      neutron-htk:
+        type: git
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        subpath: helm-toolkit
+        reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
       nova:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -237,9 +242,14 @@ data:
         reference: 332a3da0054e154c003256107a0907774531df79
       openvswitch:
         type: git
-        location: https://git.openstack.org/openstack/openstack-helm
+        location: https://review.opendev.org/openstack/openstack-helm-infra
         subpath: openvswitch
-        reference: 20d863ce9d18203f2c6a1d679d0cec2bd4fa550d
+        reference: refs/changes/94/626894/22
+      openvswitch-htk:
+        location: https://review.opendev.org/openstack/openstack-helm-infra
+        reference: refs/changes/94/626894/22
+        subpath: helm-toolkit
+        type: git
       rabbitmq:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -423,13 +433,11 @@ data:
     images:
       dep_check: &dep_check quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
       heat: &heat docker.io/openstackhelm/heat:ocata
-      neutron: &neutron docker.io/openstackhelm/neutron:ocata
-      neutron_sriov_agent: &neutron_sriov docker.io/openstackhelm/neutron:ocata-sriov-1804
-      neutron_sriov_agent_init: &neutron_sriov_init docker.io/openstackhelm/neutron:ocata-sriov-1804
+      neutron: &neutron docker.io/gkunz/neutron-ocata-2.10.1
       horizon: &horizon docker.io/openstackhelm/horizon:ocata
       cinder: &cinder docker.io/openstackhelm/cinder:ocata
       keystone: &keystone docker.io/openstackhelm/keystone:ocata
-      nova: &nova docker.io/openstackhelm/nova:ocata
+      nova: &nova docker.io/gkunz/nova-ocata-2.10.1
       glance: &glance docker.io/openstackhelm/glance:ocata
       rabbitmq: &rabbitmq docker.io/rabbitmq:3.7-management
       rally_test: &rally_test docker.io/kolla/ubuntu-source-rally:4.0.0
@@ -438,7 +446,6 @@ data:
       nova_novncproxy: &nova_novncproxy docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3
       nova_spiceproxy: &nova_spiceproxy docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
       ceph_daemon: &ceph_daemon docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
-      openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:v2.8.1
       os_barbican: &os_barbican docker.io/openstackhelm/barbican:ocata
       libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1
       ingress_controller: &ingress_controller quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
@@ -459,8 +466,8 @@ data:
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
         image_repo_sync: docker.io/docker:17.07.0
-        helm: docker.io/lachlanevenson/k8s-helm:v2.9.1
-        tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
+        helm: docker.io/lachlanevenson/k8s-helm:v2.13.1
+        tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
       promenade:
         promenade: quay.io/airshipit/promenade:7a06bef72c0bfd799c2353b8213627f6a0826251
         ks_user: docker.io/openstackhelm/heat:ocata
@@ -544,7 +551,7 @@ data:
         rabbit_init: docker.io/rabbitmq:3.7-management
         image_repo_sync: docker.io/docker:17.07.0
       tiller:
-        tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
+        tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
       mariadb:
         mariadb: docker.io/mariadb:10.2.13
         ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
@@ -677,8 +684,6 @@ data:
         neutron_l3: *neutron
         neutron_openvswitch_agent: *neutron
         neutron_linuxbridge_agent: *neutron
-        neutron_sriov_agent: *neutron_sriov
-        neutron_sriov_agent_init: *neutron_sriov_init
         dep_check: *dep_check
         rabbit_init: *rabbitmq
       nova:
@@ -704,9 +709,9 @@ data:
         test: *rally_test
         rabbit_init: *rabbitmq
       openvswitch:
-        openvswitch_db_server: *openvswitch
-        openvswitch_vswitchd: *openvswitch
         dep_check: *dep_check
+        openvswitch_db_server: openstackhelm/openvswitch@sha256:b3cd60dc54c08711c0318cfb6aad2b1556e3741d2b109a9c41fd6f12e0a2289b
+        openvswitch_vswitchd: openstackhelm/openvswitch@sha256:b3cd60dc54c08711c0318cfb6aad2b1556e3741d2b109a9c41fd6f12e0a2289b
       rabbitmq:
         prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
         prometheus_rabbitmq_exporter_helm_tests: *heat