Merge "Fix Venus containers built from correct branch" into stable/zed

Author: Zuul

kolla/common/sources.py

@@ -316,12 +316,10 @@
         'type': 'url',
         'location': ('$tarballs_base/openstack/trove/'
                      'trove-${openstack_branch}.tar.gz')},
-    # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
-    # exists.
     'venus-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/venus/'
-                     'venus-master.tar.gz')},
+                     'venus-${openstack_branch}.tar.gz')},
     'vitrage-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/vitrage/'