From ff2842965a720bfe69e656b1c6c83e8d0eb12cde Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sat, 30 Sep 2017 13:36:09 -0700 Subject: [PATCH] Set up firewall for legacy multinode jobs This opens up the firewall wide open for legacy multinode test jobs. We used to do this in the nodepool ready script and need to do it in the jobs in zuulv3. Depends-On: Ic9eda6b951c5ecf5997fe9da3338980f2a8121b0 Change-Id: I110879bac5d8a671d73fab906ffbcf8156b1135d --- .../legacy/multinode-networking/pre.yaml | 3 + zuul.d/jobs.yaml | 12 +++ zuul.d/zuul-legacy-jobs.yaml | 94 +++++++++---------- 3 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 playbooks/legacy/multinode-networking/pre.yaml diff --git a/playbooks/legacy/multinode-networking/pre.yaml b/playbooks/legacy/multinode-networking/pre.yaml new file mode 100644 index 00000000..3d29085c --- /dev/null +++ b/playbooks/legacy/multinode-networking/pre.yaml @@ -0,0 +1,3 @@ +- hosts: all + roles: + - multi-node-firewall diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 7d29c9d2..5b580080 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -332,6 +332,18 @@ - openstack/tripleo-incubator - openstack/zaqar +- job: + name: legacy-dsvm-base-multinode + parent: legacy-dsvm-base + description: | + Base job for multinode devstack jobs. + + Will setup firewall rules on all the nodes allowing them to talk to + each other. + roles: + - zuul: openstack-infra/zuul-jobs + pre-run: playbooks/legacy/multinode-networking/pre + - job: name: legacy-puppet-openstack-integration description: | diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index b53b44b0..a9d33ba5 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2304,7 +2304,7 @@ - job: name: legacy-functional-dsvm-magnum-k8s-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/functional-dsvm-magnum-k8s-multinode/run post-run: playbooks/legacy/functional-dsvm-magnum-k8s-multinode/post timeout: 7800 @@ -2395,7 +2395,7 @@ - job: name: legacy-functional-dsvm-magnum-swarm-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/functional-dsvm-magnum-swarm-multinode/run post-run: playbooks/legacy/functional-dsvm-magnum-swarm-multinode/post timeout: 7800 @@ -2561,7 +2561,7 @@ - job: name: legacy-glance-dsvm-grenade-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/glance-dsvm-grenade-multinode/run post-run: playbooks/legacy/glance-dsvm-grenade-multinode/post timeout: 10800 @@ -2747,7 +2747,7 @@ - job: name: legacy-grenade-dsvm-heat-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-heat-multinode/run post-run: playbooks/legacy/grenade-dsvm-heat-multinode/post timeout: 7800 @@ -2793,7 +2793,7 @@ - job: name: legacy-grenade-dsvm-ironic-multinode-multitenant - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run post-run: playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/post timeout: 10800 @@ -2891,7 +2891,7 @@ - job: name: legacy-grenade-dsvm-neutron-dvr-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-dvr-multinode/run post-run: playbooks/legacy/grenade-dsvm-neutron-dvr-multinode/post timeout: 7500 @@ -2914,7 +2914,7 @@ - job: name: legacy-grenade-dsvm-neutron-fwaas-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-fwaas-multinode/run post-run: playbooks/legacy/grenade-dsvm-neutron-fwaas-multinode/post timeout: 7500 @@ -2947,7 +2947,7 @@ - job: name: legacy-grenade-dsvm-neutron-linuxbridge-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-linuxbridge-multinode/run post-run: playbooks/legacy/grenade-dsvm-neutron-linuxbridge-multinode/post timeout: 7500 @@ -2959,7 +2959,7 @@ - job: name: legacy-grenade-dsvm-neutron-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-multinode/run post-run: playbooks/legacy/grenade-dsvm-neutron-multinode/post timeout: 10800 @@ -2971,7 +2971,7 @@ - job: name: legacy-grenade-dsvm-neutron-multinode-live-migration - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-multinode-live-migration/run post-run: playbooks/legacy/grenade-dsvm-neutron-multinode-live-migration/post timeout: 10800 @@ -2983,7 +2983,7 @@ - job: name: legacy-grenade-dsvm-neutron-multinode-zero-downtime - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/run post-run: playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/post timeout: 10800 @@ -3492,7 +3492,7 @@ - job: name: legacy-install-dsvm-kuryr-libnetwork-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/install-dsvm-kuryr-libnetwork-multinode/run post-run: playbooks/legacy/install-dsvm-kuryr-libnetwork-multinode/post timeout: 7800 @@ -3764,7 +3764,7 @@ - job: name: legacy-keystone-dsvm-grenade-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/keystone-dsvm-grenade-multinode/run post-run: playbooks/legacy/keystone-dsvm-grenade-multinode/post timeout: 10800 @@ -3881,7 +3881,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/post timeout: 5400 @@ -3889,7 +3889,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/post timeout: 5400 @@ -3897,7 +3897,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/post timeout: 5400 @@ -3905,7 +3905,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/post timeout: 5400 @@ -3913,7 +3913,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/post timeout: 5400 @@ -3921,7 +3921,7 @@ - job: name: legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post timeout: 5400 @@ -3959,7 +3959,7 @@ - job: name: legacy-kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run post-run: playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/post timeout: 5400 @@ -5306,7 +5306,7 @@ - job: name: legacy-neutron-fwaas-v1-dsvm-tempest-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/neutron-fwaas-v1-dsvm-tempest-multinode/run post-run: playbooks/legacy/neutron-fwaas-v1-dsvm-tempest-multinode/post timeout: 7500 @@ -5331,7 +5331,7 @@ - job: name: legacy-neutron-fwaas-v2-dsvm-tempest-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/neutron-fwaas-v2-dsvm-tempest-multinode/run post-run: playbooks/legacy/neutron-fwaas-v2-dsvm-tempest-multinode/post timeout: 7500 @@ -5826,7 +5826,7 @@ - job: name: legacy-octavia-v1-dsvm-py3x-scenario-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post timeout: 7800 @@ -5894,7 +5894,7 @@ - job: name: legacy-octavia-v1-dsvm-scenario-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run post-run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/post timeout: 7800 @@ -7373,7 +7373,7 @@ - job: name: legacy-oslo.messaging-src-grenade-dsvm-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/oslo.messaging-src-grenade-dsvm-multinode/run post-run: playbooks/legacy/oslo.messaging-src-grenade-dsvm-multinode/post timeout: 10800 @@ -7531,7 +7531,7 @@ - job: name: legacy-oslo.versionedobjects-src-grenade-dsvm-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/run post-run: playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/post timeout: 10800 @@ -8763,7 +8763,7 @@ - job: name: legacy-publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run post-run: playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post timeout: 7200 @@ -8778,7 +8778,7 @@ - job: name: legacy-publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run post-run: playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post timeout: 7200 @@ -10999,7 +10999,7 @@ - job: name: legacy-sahara-dsvm-scenario-multinode-spark - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/sahara-dsvm-scenario-multinode-spark/run post-run: playbooks/legacy/sahara-dsvm-scenario-multinode-spark/post timeout: 7800 @@ -12571,7 +12571,7 @@ - job: name: legacy-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run post-run: playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/post timeout: 10800 @@ -12895,7 +12895,7 @@ - job: name: legacy-tempest-dsvm-kuryr-kubernetes-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-kuryr-kubernetes-multinode/run post-run: playbooks/legacy/tempest-dsvm-kuryr-kubernetes-multinode/post timeout: 7500 @@ -13175,7 +13175,7 @@ - job: name: legacy-tempest-dsvm-multinode-full - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-multinode-full/run post-run: playbooks/legacy/tempest-dsvm-multinode-full/post timeout: 10800 @@ -13186,7 +13186,7 @@ - job: name: legacy-tempest-dsvm-multinode-live-migration - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-multinode-live-migration/run post-run: playbooks/legacy/tempest-dsvm-multinode-live-migration/post timeout: 10800 @@ -13362,7 +13362,7 @@ - job: name: legacy-tempest-dsvm-networking-midonet-multinode-ml2 - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-networking-midonet-multinode-ml2/run post-run: playbooks/legacy/tempest-dsvm-networking-midonet-multinode-ml2/post timeout: 7800 @@ -13399,7 +13399,7 @@ - job: name: legacy-tempest-dsvm-networking-odl-multinode-carbon-snapshot - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-networking-odl-multinode-carbon-snapshot/run post-run: playbooks/legacy/tempest-dsvm-networking-odl-multinode-carbon-snapshot/post timeout: 10800 @@ -13411,7 +13411,7 @@ - job: name: legacy-tempest-dsvm-networking-odl-multinode-nitrogen-snapshot - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-networking-odl-multinode-nitrogen-snapshot/run post-run: playbooks/legacy/tempest-dsvm-networking-odl-multinode-nitrogen-snapshot/post timeout: 10800 @@ -13445,7 +13445,7 @@ - job: name: legacy-tempest-dsvm-networking-ovn-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-networking-ovn-multinode/run post-run: playbooks/legacy/tempest-dsvm-networking-ovn-multinode/post timeout: 7800 @@ -13536,7 +13536,7 @@ - job: name: legacy-tempest-dsvm-networking-sfc-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-networking-sfc-multinode/run post-run: playbooks/legacy/tempest-dsvm-networking-sfc-multinode/post timeout: 10800 @@ -13559,7 +13559,7 @@ - job: name: legacy-tempest-dsvm-neutron-dvr-ha-multinode-full - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-neutron-dvr-ha-multinode-full/run post-run: playbooks/legacy/tempest-dsvm-neutron-dvr-ha-multinode-full/post timeout: 10800 @@ -13571,7 +13571,7 @@ - job: name: legacy-tempest-dsvm-neutron-dvr-multinode-full - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-neutron-dvr-multinode-full/run post-run: playbooks/legacy/tempest-dsvm-neutron-dvr-multinode-full/post timeout: 10800 @@ -13583,7 +13583,7 @@ - job: name: legacy-tempest-dsvm-neutron-dvr-multinode-scenario - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-neutron-dvr-multinode-scenario/run post-run: playbooks/legacy/tempest-dsvm-neutron-dvr-multinode-scenario/post timeout: 10800 @@ -13719,7 +13719,7 @@ - job: name: legacy-tempest-dsvm-neutron-multinode-full - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-neutron-multinode-full/run post-run: playbooks/legacy/tempest-dsvm-neutron-multinode-full/post timeout: 10800 @@ -13787,7 +13787,7 @@ - job: name: legacy-tempest-dsvm-neutron-scenario-multinode-lvm-multibackend - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-neutron-scenario-multinode-lvm-multibackend/run post-run: playbooks/legacy/tempest-dsvm-neutron-scenario-multinode-lvm-multibackend/post timeout: 10800 @@ -13989,7 +13989,7 @@ - job: name: legacy-tempest-dsvm-patrole-multinode-admin - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-patrole-multinode-admin/run post-run: playbooks/legacy/tempest-dsvm-patrole-multinode-admin/post timeout: 7800 @@ -14001,7 +14001,7 @@ - job: name: legacy-tempest-dsvm-patrole-multinode-member - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-patrole-multinode-member/run post-run: playbooks/legacy/tempest-dsvm-patrole-multinode-member/post timeout: 7800 @@ -14142,7 +14142,7 @@ - job: name: legacy-tempest-dsvm-zun-multinode-docker-sql - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/run post-run: playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/post timeout: 7800 @@ -15738,7 +15738,7 @@ - job: name: legacy-watcher-dsvm-multinode - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/watcher-dsvm-multinode/run post-run: playbooks/legacy/watcher-dsvm-multinode/post timeout: 4200