commit 0f9da065d489c12b32a223775fa2bbb33dd87a78 Author: Iury Gregory Melo Ferreira Date: Wed Sep 23 15:03:55 2020 +0200 Migrate IPE job to focal Depends-On: https://review.opendev.org/#/c/739448/ Change-Id: Ic99e20222f8af694ffe4ddd88bdaa150faa32f30 diff --git a/.zuul.yaml b/.zuul.yaml index 8cd2c16..6d7b04d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ name: ironic-prometheus-exporter-redfish description: Job that installs the exporter with redfish driver. parent: devstack - nodeset: openstack-single-node-bionic + nodeset: openstack-single-node-focal timeout: 5400 required-projects: - openstack/ironic @@ -45,7 +45,7 @@ IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_SPECS_RAM: 512 IRONIC_VM_SPECS_DISK: 4 - IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi + IRONIC_DEFAULT_DEPLOY_INTERFACE: direct Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan SERVICE_TIMEOUT: 90 @@ -58,6 +58,7 @@ '{{ devstack_base_dir }}/ironic-bm-logs': 'logs' '{{ devstack_base_dir }}/ironic-bm-logs/ipe': 'logs' devstack_services: + dstat: false q-agt: true q-dhcp: true q-l3: true diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 394eba0..61b0ad9 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -28,7 +28,7 @@ function configure_ironic_prometheus_exporter { local gunicorn_ipe_cmd - gunicorn_ipe_cmd=$(which gunicorn3) + gunicorn_ipe_cmd=$(which gunicorn) gunicorn_ipe_cmd+=" -b ${HOST_IP}:${IRONIC_PROMETHEUS_EXPORTER_PORT}" gunicorn_ipe_cmd+=" --env IRONIC_CONFIG=$IRONIC_CONFIG" gunicorn_ipe_cmd+=" --env FLASK_DEBUG=1 -w 4"