meta-starlingx: remove the upstream layer

[pti/rtp.git] / meta-starlingx / meta-stx-flock / stx-ansible-playbooks / files / 0001-stx.3.0-rebase-adjust-path.patch

diff --git a/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch b/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch
deleted file mode 100644 (file)
index 0a1628d..0000000
--- a/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 91da8b2956e346916f092fe2ce3a18e2422023e7 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Fri, 6 Mar 2020 22:43:25 -0800
-Subject: [PATCH] stx.3.0 rebase: adjust path
-
----
- .../roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml     | 2 +-
- .../src/playbooks/roles/recover-ceph-data/tasks/main.yml        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-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
-index 23591c8..e4c905c 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
-@@ -90,7 +90,7 @@
- 
- - name: Applying puppet bootstrap manifest
-   command: >
--    /usr/local/bin/puppet-manifest-apply.sh
-+    /usr/bin/puppet-manifest-apply.sh
-     {{ hieradata_workdir }}
-     {{ derived_network_params.controller_0_address }}
-     controller ansible_bootstrap > {{ manifest_apply_log }}
-diff --git a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-index d92021f..a01a3f6 100644
---- a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-+++ b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-@@ -45,7 +45,7 @@
- 
-       - name: Applying puppet ceph-mon DRBD manifest
-         command: >
--          /usr/local/bin/puppet-manifest-apply.sh
-+          /usr/bin/puppet-manifest-apply.sh
-           {{ puppet_permdir }}/hieradata/
-           {{ derived_network_params.controller_0_address }}
-           controller runtime /tmp/ceph-mon.yml
--- 
-2.23.0
-