meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0002-puppet-manifests-port-Adjust-path-default-bindir.patch

   1 From e321b75d4810c4bd66fe4ec10b974ad77184d74f Mon Sep 17 00:00:00 2001
   2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
   3 Date: Sat, 7 Mar 2020 00:18:43 -0800
   4 Subject: [PATCH] puppet-manifests port: Adjust path default bindir
   5
   6 ---
   7  .../src/modules/platform/files/ldap.cgcs-shell.ldif  |  2 +-
   8  .../src/modules/platform/manifests/collectd.pp       |  2 +-
   9  .../src/modules/platform/manifests/drbd.pp           |  4 ++--
  10  .../src/modules/platform/manifests/ldap.pp           |  4 ++--
  11  .../src/modules/platform/manifests/network.pp        |  2 +-
  12  .../src/modules/platform/manifests/remotelogging.pp  |  2 +-
  13  .../modules/platform/templates/ldapscripts.conf.erb  | 12 ++++++------
  14  7 files changed, 14 insertions(+), 14 deletions(-)
  15
  16 diff --git a/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif b/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
  17 index 95005fd..6ae4838 100644
  18 --- a/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
  19 +++ b/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
  20 @@ -1,4 +1,4 @@
  21  dn: uid=operator,ou=People,dc=cgcs,dc=local
  22  changetype: modify
  23  replace: loginShell
  24 -loginShell: /usr/local/bin/cgcs_cli
  25 +loginShell: /usr/bin/cgcs_cli
  26 diff --git a/puppet-manifests/src/modules/platform/manifests/collectd.pp b/puppet-manifests/src/modules/platform/manifests/collectd.pp
  27 index 99e1d2d..a35bc6f 100644
  28 --- a/puppet-manifests/src/modules/platform/manifests/collectd.pp
  29 +++ b/puppet-manifests/src/modules/platform/manifests/collectd.pp
  30 @@ -58,6 +58,6 @@ class platform::collectd::runtime {
  31  class platform::collectd::restart {
  32    include ::platform::collectd
  33    exec { 'collectd-restart':
  34 -      command => '/usr/local/sbin/pmon-restart collectd'
  35 +      command => '/usr/sbin/pmon-restart collectd'
  36    }
  37  }
  38 diff --git a/puppet-manifests/src/modules/platform/manifests/drbd.pp b/puppet-manifests/src/modules/platform/manifests/drbd.pp
  39 index f7dc3bc..bb20b82 100644
  40 --- a/puppet-manifests/src/modules/platform/manifests/drbd.pp
  41 +++ b/puppet-manifests/src/modules/platform/manifests/drbd.pp
  42 @@ -79,9 +79,9 @@ define platform::drbd::filesystem (
  43      mountpoint    => $mountpoint,
  44      handlers      => {
  45        before-resync-target =>
  46 -        "/usr/local/sbin/sm-notify -s ${sm_service} -e sync-start",
  47 +        "/usr/sbin/sm-notify -s ${sm_service} -e sync-start",
  48        after-resync-target  =>
  49 -        "/usr/local/sbin/sm-notify -s ${sm_service} -e sync-end",
  50 +        "/usr/sbin/sm-notify -s ${sm_service} -e sync-end",
  51      },
  52      host1         => $::platform::drbd::params::host1,
  53      host2         => $::platform::drbd::params::host2,
  54 diff --git a/puppet-manifests/src/modules/platform/manifests/ldap.pp b/puppet-manifests/src/modules/platform/manifests/ldap.pp
  55 index b3d6ee7..8770bff 100644
  56 --- a/puppet-manifests/src/modules/platform/manifests/ldap.pp
  57 +++ b/puppet-manifests/src/modules/platform/manifests/ldap.pp
  58 @@ -60,7 +60,7 @@ class platform::ldap::server::local
  59
  60    # don't populate the adminpw if binding anonymously
  61    if ! $bind_anonymous {
  62 -    file { '/usr/local/etc/ldapscripts/ldapscripts.passwd':
  63 +    file { '/etc/ldapscripts/ldapscripts.passwd':
  64        content => $admin_pw,
  65      }
  66    }
  67 @@ -104,7 +104,7 @@ class platform::ldap::client
  68    }
  69
  70    if $::personality == 'controller' {
  71 -    file { '/usr/local/etc/ldapscripts/ldapscripts.conf':
  72 +    file { '/etc/ldapscripts/ldapscripts.conf':
  73        ensure  => 'present',
  74        replace => true,
  75        content => template('platform/ldapscripts.conf.erb'),
  76 diff --git a/puppet-manifests/src/modules/platform/manifests/network.pp b/puppet-manifests/src/modules/platform/manifests/network.pp
  77 index 5b94521..dbeb6d2 100644
  78 --- a/puppet-manifests/src/modules/platform/manifests/network.pp
  79 +++ b/puppet-manifests/src/modules/platform/manifests/network.pp
  80 @@ -225,7 +225,7 @@ class platform::network (
  81
  82    $management_interface = $::platform::network::mgmt::params::interface_name
  83
  84 -  $testcmd = '/usr/local/bin/connectivity_test'
  85 +  $testcmd = '/usr/bin/connectivity_test'
  86
  87    if $::personality != 'controller' {
  88      if $management_interface {
  89 diff --git a/puppet-manifests/src/modules/platform/manifests/remotelogging.pp b/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
  90 index acf1dfd..b30163e 100644
  91 --- a/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
  92 +++ b/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
  93 @@ -42,7 +42,7 @@ class platform::remotelogging
  94        content => template('platform/remotelogging.conf.erb'),
  95      }
  96      -> exec { 'remotelogging-update-tc':
  97 -      command => "/usr/local/bin/remotelogging_tc_setup.sh ${port}"
  98 +      command => "/usr/bin/remotelogging_tc_setup.sh ${port}"
  99      }
 100      -> Exec['syslog-ng-reload']
 101
 102 diff --git a/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb b/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
 103 index e3bc6e0..89d6d6c 100644
 104 --- a/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
 105 +++ b/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
 106 @@ -46,7 +46,7 @@ SASLAUTH=""
 107
 108  <%- if @bind_anonymous != true -%>
 109  BINDDN="cn=ldapadmin,dc=cgcs,dc=local"
 110 -BINDPWDFILE="/usr/local/etc/ldapscripts/ldapscripts.passwd"
 111 +BINDPWDFILE="/etc/ldapscripts/ldapscripts.passwd"
 112  <%- end -%>
 113
 114  # For older versions of OpenLDAP, it is still possible to use
 115 @@ -155,9 +155,9 @@ GETENTGRCMD="getent group"
 116  #GTEMPLATE="/path/to/ldapaddgroup.template"
 117  #UTEMPLATE="/path/to/ldapadduser.template"
 118  #MTEMPLATE="/path/to/ldapaddmachine.template"
 119 -GTEMPLATE="/usr/local/etc/ldapscripts/ldapaddgroup.template.cgcs"
 120 -UTEMPLATE="/usr/local/etc/ldapscripts/ldapadduser.template.cgcs"
 121 -UMTEMPLATE="/usr/local/etc/ldapscripts/ldapmoduser.template.cgcs"
 122 -STEMPLATE="/usr/local/etc/ldapscripts/ldapaddsudo.template.cgcs"
 123 -SMTEMPLATE="/usr/local/etc/ldapscripts/ldapmodsudo.template.cgcs"
 124 +GTEMPLATE="/etc/ldapscripts/ldapaddgroup.template.cgcs"
 125 +UTEMPLATE="/etc/ldapscripts/ldapadduser.template.cgcs"
 126 +UMTEMPLATE="/etc/ldapscripts/ldapmoduser.template.cgcs"
 127 +STEMPLATE="/etc/ldapscripts/ldapaddsudo.template.cgcs"
 128 +SMTEMPLATE="/etc/ldapscripts/ldapmodsudo.template.cgcs"
 129  MTEMPLATE=""
 130 --
 131 2.23.0
 132