From cfe5ade02468e87db51b4040b4bbb50291942afa Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Wed, 6 Sep 2017 18:58:46 +0000 Subject: [PATCH] Be explicit about SDN plugin in gate override We now support linuxbridge and ovs. Rename the files to reflect this. Change-Id: I4bedf5bf9d8f22994e34b55f6e4da58bda0fde23 --- doc/source/install/developer/all-in-one.rst | 2 +- tools/gate/launch-osh/basic.sh | 2 +- tools/overrides/mvp/{neutron.yaml => neutron-ovs.yaml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/overrides/mvp/{neutron.yaml => neutron-ovs.yaml} (100%) diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst index e67ce86a7d..37e09dc4aa 100644 --- a/doc/source/install/developer/all-in-one.rst +++ b/doc/source/install/developer/all-in-one.rst @@ -238,7 +238,7 @@ more sensible values for the All-in-One environment using the ``--values`` and --values=./tools/overrides/mvp/nova.yaml \ --set=conf.nova.libvirt.nova.conf.virt_type=qemu helm install --name=neutron ./neutron \ - --namespace=openstack --values=./tools/overrides/mvp/neutron.yaml + --namespace=openstack --values=./tools/overrides/mvp/neutron-ovs.yaml helm install --name=horizon ./horizon --namespace=openstack \ --set=network.enable_node_port=true diff --git a/tools/gate/launch-osh/basic.sh b/tools/gate/launch-osh/basic.sh index 27bda961c4..6bd509e385 100755 --- a/tools/gate/launch-osh/basic.sh +++ b/tools/gate/launch-osh/basic.sh @@ -137,7 +137,7 @@ else --set=conf.nova.libvirt.nova.conf.virt_type=qemu fi helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ - --values=${WORK_DIR}/tools/overrides/mvp/neutron.yaml + --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT} helm install --namespace=openstack ${WORK_DIR}/heat --name=heat diff --git a/tools/overrides/mvp/neutron.yaml b/tools/overrides/mvp/neutron-ovs.yaml similarity index 100% rename from tools/overrides/mvp/neutron.yaml rename to tools/overrides/mvp/neutron-ovs.yaml