Merge pull request #510 from stackhpc/xena-wallaby-merge

Revert "Build Neutron from stackhpc fork"

Author: markgoddard

etc/kayobe/kolla.yml

@@ -137,10 +137,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/magnum.git
     reference: stackhpc/xena
-  neutron-base:
-    type: git
-    location: https://github.com/stackhpc/neutron.git
-    reference: stackhpc/{{ openstack_release }}
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git