summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric MacDonald <eric.macdonald@windriver.com>2019-01-14 15:22:06 -0500
committerEric MacDonald <eric.macdonald@windriver.com>2019-01-14 20:40:15 +0000
commit7dd943fe46681ff361533b65807416fc44adf971 (patch)
tree0d7aeab5316da9d8b0f7e64486a0fe8a1b5ead19
parent03825fcda41edf505bbc61e47e4d1aac18f07297 (diff)
Fix mtce.pp to handle missing /etc/rmonfiles.d directory
https://review.openstack.org/#/c/628687/ stopped packaging the query_ntp_servers.sh script. However, since there were no other files being packaged into that directory the spec file choose not to create an empty directory. When config controller called the mtce.pp manifest to install dynamic files into /etc/rmonfiles.d it could not. So it failed. This update adds a directory check block to the mtce.pp file to create the directoy if its not present. Testing: Install AIO SX in SM1 Change-Id: Ib2dfadb261be6f9ebbaa7213eb6669b25158c779 Closes-Bug: 1811693 Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Notes
Notes (review): Code-Review+2: Don Penney <don.penney@windriver.com> Code-Review+2: Bob Church <robert.church@windriver.com> Workflow+1: Bob Church <robert.church@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 14 Jan 2019 21:03:50 +0000 Reviewed-on: https://review.openstack.org/630768 Project: openstack/stx-config Branch: refs/heads/master
-rw-r--r--puppet-manifests/centos/build_srpm.data2
-rw-r--r--puppet-manifests/src/modules/platform/manifests/mtce.pp7
2 files changed, 7 insertions, 2 deletions
diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data
index 89ee8fe..c68b630 100644
--- a/puppet-manifests/centos/build_srpm.data
+++ b/puppet-manifests/centos/build_srpm.data
@@ -1,2 +1,2 @@
1SRC_DIR="src" 1SRC_DIR="src"
2TIS_PATCH_VER=77 2TIS_PATCH_VER=78
diff --git a/puppet-manifests/src/modules/platform/manifests/mtce.pp b/puppet-manifests/src/modules/platform/manifests/mtce.pp
index 705ac72..f48f30b 100644
--- a/puppet-manifests/src/modules/platform/manifests/mtce.pp
+++ b/puppet-manifests/src/modules/platform/manifests/mtce.pp
@@ -39,7 +39,12 @@ class platform::mtce
39 39
40 $boot_device = $::boot_disk_device_path 40 $boot_device = $::boot_disk_device_path
41 41
42 file { '/etc/rmonfiles.d/static.conf': 42 file {'/etc/rmonfiles.d':
43 ensure => directory,
44 mode => '0755',
45 }
46
47 -> file { '/etc/rmonfiles.d/static.conf':
43 ensure => present, 48 ensure => present,
44 mode => '0644', 49 mode => '0644',
45 content => template('mtce/static_conf.erb'), 50 content => template('mtce/static_conf.erb'),