meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch

   1 From 91da8b2956e346916f092fe2ce3a18e2422023e7 Mon Sep 17 00:00:00 2001
   2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
   3 Date: Fri, 6 Mar 2020 22:43:25 -0800
   4 Subject: [PATCH] stx.3.0 rebase: adjust path
   5
   6 ---
   7  .../roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml     | 2 +-
   8  .../src/playbooks/roles/recover-ceph-data/tasks/main.yml        | 2 +-
   9  2 files changed, 2 insertions(+), 2 deletions(-)
  10
  11 diff --git a/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
  12 index 23591c8..e4c905c 100644
  13 --- a/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
  14 +++ b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
  15 @@ -90,7 +90,7 @@
  16
  17  - name: Applying puppet bootstrap manifest
  18    command: >
  19 -    /usr/local/bin/puppet-manifest-apply.sh
  20 +    /usr/bin/puppet-manifest-apply.sh
  21      {{ hieradata_workdir }}
  22      {{ derived_network_params.controller_0_address }}
  23      controller ansible_bootstrap > {{ manifest_apply_log }}
  24 diff --git a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
  25 index d92021f..a01a3f6 100644
  26 --- a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
  27 +++ b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
  28 @@ -45,7 +45,7 @@
  29
  30        - name: Applying puppet ceph-mon DRBD manifest
  31          command: >
  32 -          /usr/local/bin/puppet-manifest-apply.sh
  33 +          /usr/bin/puppet-manifest-apply.sh
  34            {{ puppet_permdir }}/hieradata/
  35            {{ derived_network_params.controller_0_address }}
  36            controller runtime /tmp/ceph-mon.yml
  37 --
  38 2.23.0
  39