diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-20 13:48:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-20 13:48:03 +0000 |
| commit | 103e34f5a8e3f22b329b6a38a05edff5539bb063 (patch) | |
| tree | 37fa9d7597370feceff2e1737eecf2889d5e7080 | |
| parent | 59563e9581a874fb7d39815d1103127bd0b0cc7a (diff) | |
| parent | b5872c90327a00256e064a80482124a8bdce5d42 (diff) | |
| download | ironic-103e34f5a8e3f22b329b6a38a05edff5539bb063.tar.gz | |
Merge "Set glance limit for baremetal friendly images"
| -rw-r--r-- | doc/source/contributor/dev-quickstart.rst | 6 | ||||
| -rw-r--r-- | doc/source/contributor/ironic-boot-from-volume.rst | 3 | ||||
| -rw-r--r-- | doc/source/contributor/ironic-multitenant-networking.rst | 3 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/doc/source/contributor/dev-quickstart.rst b/doc/source/contributor/dev-quickstart.rst index f3f452f4c..3fe03f02b 100644 --- a/doc/source/contributor/dev-quickstart.rst +++ b/doc/source/contributor/dev-quickstart.rst @@ -455,6 +455,9 @@ hardware type by default:: SERVICE_PASSWORD=password SERVICE_TOKEN=password + # Set glance's default limit to be baremetal image friendly + GLANCE_LIMIT_IMAGE_SIZE_TOTAL=5000 + # Enable Ironic plugin enable_plugin ironic https://opendev.org/openstack/ironic @@ -539,6 +542,9 @@ Ironic will have enabled the ``direct`` :doc:`deploy interface SWIFT_HASH=password SWIFT_TEMPURL_KEY=password + # Set glance's default limit to be baremetal image friendly + GLANCE_LIMIT_IMAGE_SIZE_TOTAL=5000 + # Enable Ironic plugin enable_plugin ironic https://opendev.org/openstack/ironic diff --git a/doc/source/contributor/ironic-boot-from-volume.rst b/doc/source/contributor/ironic-boot-from-volume.rst index 359489623..fc3fd1c2b 100644 --- a/doc/source/contributor/ironic-boot-from-volume.rst +++ b/doc/source/contributor/ironic-boot-from-volume.rst @@ -33,6 +33,9 @@ description for DevStack is at :ref:`deploy_devstack`. SWIFT_HASH=password SWIFT_TEMPURL_KEY=password + # Set glance's default limit to be baremetal image friendly + GLANCE_LIMIT_IMAGE_SIZE_TOTAL=5000 + # Enable Neutron which is required by Ironic and disable nova-network. disable_service n-net disable_service n-novnc diff --git a/doc/source/contributor/ironic-multitenant-networking.rst b/doc/source/contributor/ironic-multitenant-networking.rst index 36d4125e9..5b4b1db28 100644 --- a/doc/source/contributor/ironic-multitenant-networking.rst +++ b/doc/source/contributor/ironic-multitenant-networking.rst @@ -80,6 +80,9 @@ configured in Neutron. # Disable Tempest disable_service tempest + # Set glance's default limit to be baremetal image friendly + GLANCE_LIMIT_IMAGE_SIZE_TOTAL=5000 + # Swift temp URL's are required for the direct deploy interface. SWIFT_ENABLE_TEMPURLS=True diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 56f2301e6..03c8adaf5 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -56,6 +56,10 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch SERVICE_TIMEOUT: 90 + # NOTE(TheJulia): Devstack default glance limit is 1GB, we need + # something more like 5GB for baremetal jobs due to image sizes + # with firmware. + GLANCE_LIMIT_IMAGE_SIZE_TOTAL: 5000 devstack_plugins: ironic: https://opendev.org/openstack/ironic tempest_plugins: |