From f57a2460dbcfbfa459e442c16aaf47c6930274f5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 1 Mar 2025 12:08:41 +0900
Subject: [PATCH] Ironic: Enable ironic-novncproxy

Depends-on: https://review.opendev.org/942902
Change-Id: I79b5a84241d2e2e7fe82d907f8eeba6e074b2772
---
 manifests/ironic.pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/manifests/ironic.pp b/manifests/ironic.pp
index 3f5b70cfa..949c29eda 100644
--- a/manifests/ironic.pp
+++ b/manifests/ironic.pp
@@ -39,6 +39,7 @@ class openstack_integration::ironic (
     Exec['update-ca-certificates'] ~> Service['httpd']
   }
 
+  # ironic
   openstack_integration::mq_user { 'ironic':
     password => 'an_even_bigger_secret',
     before   => Anchor['ironic::service::begin'],
@@ -146,6 +147,15 @@ class openstack_integration::ironic (
     enabled_vendor_interfaces     => ['fake', 'ipmitool', 'no-vendor'],
   }
   class { 'ironic::drivers::ipmi': }
+  class { 'ironic::vnc':
+    host_ip    => $::openstack_integration::config::host,
+    public_url => "${::openstack_integration::config::base_url}:6090/vnc_auto.html",
+  }
+
+  # shared
+  class { 'ironic::pxe': }
+
+  # ironic-inspector
   class { 'ironic::keystone::auth_inspector':
     public_url   => "${::openstack_integration::config::base_url}:5050",
     internal_url => "${::openstack_integration::config::base_url}:5050",
@@ -168,7 +178,6 @@ class openstack_integration::ironic (
     memcached_servers            => $::openstack_integration::config::memcached_servers,
     service_token_roles_required => true,
   }
-  class { 'ironic::pxe': }
   class { 'ironic::inspector::logging':
     debug => true,
   }