jenkins-bot has submitted this change and it was merged.

Change subject: Instance creation:  remove check for the 'show' metadata item
......................................................................


Instance creation:  remove check for the 'show' metadata item

Glance now supports the 'deactivated' image status which has
the equivalent meaning to our home-made 'show' setting:  deactivated
images are still visible but cannot be used for new instances.

'deactivated' is supported by Horizon, so we should standardize
on that setting and stop using 'show'.

Conveniently, we already had a test for 'status' so the check
for 'show' is now redundant.

Documented here:

https://wikitech.wikimedia.org/w/index.php?title=OpenStack&type=revision&diff=349377&oldid=294218

Change-Id: Id62f3863d74e9b1596a4297131191f25bce3d1f1
---
M special/SpecialNovaInstance.php
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/special/SpecialNovaInstance.php b/special/SpecialNovaInstance.php
index b81caed..b638c05 100644
--- a/special/SpecialNovaInstance.php
+++ b/special/SpecialNovaInstance.php
@@ -156,10 +156,6 @@
                        if ( $imageName === '' ) {
                                continue;
                        }
-                       $showImage = $image->getImageMetadata( 'show' );
-                       if ( !$showImage ) {
-                               continue;
-                       }
                        $imageLabel = $imageName;
                        $isDefault = $image->getImageMetadata( 'default' );
                        if ( $isDefault ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/275516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id62f3863d74e9b1596a4297131191f25bce3d1f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to