summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem.os@gmail.com>2018-03-05 10:29:22 -0500
committerMatt Riedemann <mriedem.os@gmail.com>2018-03-15 09:25:00 -0400
commit6b87eb5fae6ae8dd86d4d287780c12ae5f1d4b2b (patch)
treecdfb25bbb01b619edd48a528a58f812fcf3abdff /playbooks
parent6435b3745a603fde53da41716fdcfc1b743583b4 (diff)
downloadnova-6b87eb5fae6ae8dd86d4d287780c12ae5f1d4b2b.tar.gz
Make nova-cells-v1 run with neutron
This changes the nova-cells-v1 job to run with neutron instead of nova-network. SSH validation is already disabled in Tempest for this job. Since the os-server-external-events API is not plumbed in for cells v1, we have to disable vif plugging settings in nova-cells.conf. This means servers will be ACTIVE before networking is sure to be ready so we can't rely on ssh validation. We also configure Tempest to say floating IPs aren't available which skips several scenario tests that wouldn't work with cells v1 anyway due to them trying to ssh into the guest. Part of blueprint remove-nova-network Change-Id: I9de6b710baffdffcd1d7ab19897d5776ef27ae7e
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/legacy/nova-cells-v1/run.yaml30
1 files changed, 27 insertions, 3 deletions
diff --git a/playbooks/legacy/nova-cells-v1/run.yaml b/playbooks/legacy/nova-cells-v1/run.yaml
index 88c6eca639..49bf9a4c4e 100644
--- a/playbooks/legacy/nova-cells-v1/run.yaml
+++ b/playbooks/legacy/nova-cells-v1/run.yaml
@@ -23,6 +23,31 @@
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
+ # NOTE(mriedem): vif_plugging_timeout depends on the
+ # os-server-external-events API which isn't plumbed in for cells v1
+ # so we have to disable vif_plugging_timeout. This means servers can
+ # go to ACTIVE status before networking is setup in the guest and we
+ # can't rely on ssh validation in testing. Some tempest tests might
+ # also fail in racy ways, so add them to tempest-dsvm-cells-rc if they
+ # do.
+ - shell:
+ cmd: |
+ set -e
+ set -x
+ cat << 'EOF' >>"/tmp/dg-local.conf"
+ [[post-config|$NOVA_CELLS_CONF]]
+ [DEFAULT]
+ vif_plugging_timeout=0
+
+ [[test-config|$TEMPEST_CONFIG]]
+ [network-feature-enabled]
+ floating_ips=False
+
+ EOF
+ executable: /bin/bash
+ chdir: '{{ ansible_user_dir }}/workspace'
+ environment: '{{ zuul | zuul_legacy_vars }}'
+
- shell:
cmd: |
set -e
@@ -30,10 +55,9 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_CELLS=1
- # NOTE(mriedem): Explicitly tell devstack-gate that we need to run
- # the cells v1 job with nova-network.
- export DEVSTACK_GATE_NEUTRON=0
+ # Note that tempest-dsvm-cells-rc sets TEMPEST_RUN_VALIDATION=False
+ # so we do not have to set it here.
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-cells-rc
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh