From 49d6dae15b2fbcbb3b63848bcf8fc77ca2b06741 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 4 Jun 2021 00:55:56 +0900 Subject: [PATCH] Initialize iscsi target during installation This change enables initialization of iscsi target using the new openstacklib::iscsid class to ensure that initiator name is generated during installation. Depends-on: https://review.opendev.org/c/openstack/puppet-openstacklib/+/823795/ Change-Id: I6b762c8ef0e7b4b19ae81acf878236330b3ba3ee (cherry picked from commit c3bbd0059dbfdfd3dfdda487efc06132efc99092) --- manifests/cinder.pp | 2 ++ manifests/nova.pp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 8d4915ec2..89308b6a5 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -132,6 +132,8 @@ class openstack_integration::cinder ( target_ip_address => '127.0.0.1', manage_volume_type => true, } + include openstacklib::iscsid + Service['iscsid'] -> Service['cinder-volume'] } 'rbd': { cinder::backend::rbd { 'BACKEND_1': diff --git a/manifests/nova.pp b/manifests/nova.pp index 80f742904..52417d0cc 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -191,6 +191,9 @@ class openstack_integration::nova ( } # make sure ceph pool exists before running nova-compute Exec['create-nova'] -> Service['nova-compute'] + } else { + include openstacklib::iscsid + Service['iscsid'] -> Service['nova-compute'] } class { 'nova::scheduler': } class { 'nova::scheduler::filter': }