diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-18 03:17:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-18 03:17:03 +0000 |
| commit | 02380348276ecab67d697fb8f57a7d00f325cd33 (patch) | |
| tree | 776de86ed9c8bb21fcd4d5fcb863f4538cfd7caf /zuul.d | |
| parent | c871622ff589c3e5eb21f5938c7e07db7c9765f3 (diff) | |
| parent | bec00bd85df994efbb3f234727bcaba357125b50 (diff) | |
| download | ironic-02380348276ecab67d697fb8f57a7d00f325cd33.tar.gz | |
Merge "Ironic to use DevStack's neutron"-legacy" module"
Diffstat (limited to 'zuul.d')
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 9c6631304..964efbe7e 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -66,18 +66,12 @@ '{{ devstack_base_dir }}/ironic-bm-logs': 'logs' '{{ devstack_base_dir }}/data/networking-generic-switch/netmiko_session.log': 'logs' devstack_services: - q-agt: false - q-dhcp: false - q-l3: false - q-meta: false - q-metering: false - q-svc: false - neutron-api: true - neutron-agent: true - neutron-dhcp: true - neutron-l3: true - neutron-metadata-agent: true - neutron-metering: true + q-agt: true + q-dhcp: true + q-l3: true + q-meta: true + q-metering: true + q-svc: true c-api: False c-bak: False @@ -443,12 +437,6 @@ q-meta: False q-metering: False q-svc: False - neutron-api: False - neutron-agent: False - neutron-dhcp: False - neutron-l3: False - neutron-metadata-agent: False - neutron-metering: False - job: name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode @@ -697,19 +685,12 @@ devstack_services: # NOTE(TheJulia): It seems our devstack plugin does not play well # with multitenancy and the newer neutron service names. - neutron: True - neutron-api: True - neutron-agent: True - neutron-dhcp: True - neutron-l3: True - neutron-metadata-agent: False - neutron-metering: False - q-agt: False - q-dhcp: False - q-l3: False + q-agt: True + q-dhcp: True + q-l3: True q-meta: False q-metering: False - q-svc: False + q-svc: True swift: True devstack_plugins: ironic: https://opendev.org/openstack/ironic @@ -728,8 +709,8 @@ IRONIC_IPXE_ENABLED: True IRONIC_PROVISION_NETWORK_NAME: ironic-provision OVS_PHYSICAL_BRIDGE: brbm - NEUTRON_PHYSICAL_NETWORK: mynetwork - NEUTRON_TENANT_VLAN_RANGE: 100:150 + PHYSICAL_NETWORK: mynetwork + TENANT_VLAN_RANGE: 100:150 IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron IRONIC_NETWORK_INTERFACE: neutron IRONIC_DEFAILT_DEPLOY_INTERFACE: direct @@ -743,7 +724,6 @@ Q_PLUGIN: ml2 ENABLE_TENANT_VLANS: True Q_ML2_TENANT_NETWORK_TYPE: vlan - NEUTRON_TENANT_NETWORK_TYPE: vlan OVS_BRIDGE_MAPPINGS: "public:br-ex,mynetwork:brbm" USE_PROVIDER_NETWORKING: True PUBLIC_PHYSICAL_NETWORK: public |