aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-13 23:53:32 +0000
committerGerrit Code Review <review@openstack.org>2017-07-13 23:53:32 +0000
commitc4262a48c63ea4eed35807b7efcc594a9d550121 (patch)
treecfe478509304817425cf959852cef2a14204758a /manifests/profile/base
parent1fffae05649a1ea46744a7ac1e2c88edb797e1f1 (diff)
parentfb10b8ec5be95e761d541162150ca3eec7b58a61 (diff)
Merge "Refactor iscsi initiator-name reset into separate profile"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/iscsid.pp45
-rw-r--r--manifests/profile/base/nova/compute.pp13
2 files changed, 45 insertions, 13 deletions
diff --git a/manifests/profile/base/iscsid.pp b/manifests/profile/base/iscsid.pp
new file mode 100644
index 0000000..3637097
--- /dev/null
+++ b/manifests/profile/base/iscsid.pp
@@ -0,0 +1,45 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::iscsid
+#
+# Nova Compute profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::iscsid (
+ $step = Integer(hiera('step')),
+) {
+
+ if $step >= 2 {
+ # When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1244328
+ ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' })
+ exec { 'reset-iscsi-initiator-name':
+ command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
+ onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
+ before => File['/etc/iscsi/.initiator_reset'],
+ require => Package['iscsi-initiator-utils'],
+ tag => 'iscsid_config'
+ }
+ file { '/etc/iscsi/.initiator_reset':
+ ensure => present,
+ }
+ }
+}
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index bd50204..3eae880 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -45,19 +45,6 @@ class tripleo::profile::base::nova::compute (
# deploy bits to connect nova compute to neutron
include ::nova::network::neutron
-
- # When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
- # https://bugzilla.redhat.com/show_bug.cgi?id=1244328
- ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' })
- exec { 'reset-iscsi-initiator-name':
- command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
- onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
- before => File['/etc/iscsi/.initiator_reset'],
- require => Package['iscsi-initiator-utils'],
- }
- file { '/etc/iscsi/.initiator_reset':
- ensure => present,
- }
}
# If NFS is used as a Cinder backend