Move all the directories used for install-files into a subdirectorybaserock/adamcoldrick/all-exts-in-definitions-v2

Change-Id: I309c183ce8b9ff9d0f5ac4807244547f2cc4ddf5

13 files changed, 14 insertions, 14 deletions

diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph
index f9cc04a2..2585fbdf 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph
@@ -17,4 +17,4 @@ systems:
           HOSTNAME: CephNode4
 
           # You must install authorized_keys in chef/root/.ssh/ before this will work.
-          INSTALL_FILES: chef/manifest
+          INSTALL_FILES: install-files/chef/manifest
diff --git a/clusters/ci.morph b/clusters/ci.morph
index d37733ab..69b7c76a 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -74,7 +74,7 @@ systems:
       type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 5G
-      INSTALL_FILES: openstack/manifest
+      INSTALL_FILES: install-files/openstack/manifest
       HOSTNAME: onenode
       RABBITMQ_HOST: onenode
       RABBITMQ_PORT: 5672
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph
index b5cd11ef..5208a5ca 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.morph
@@ -16,7 +16,7 @@ systems:
     DISTBUILD_CONTROLLER: false
     DISTBUILD_WORKER: true
     FSTAB_SRC: LABEL=src /srv/distbuild auto defaults,rw,noatime 0 2
-    INSTALL_FILES: distbuild/manifest
+    INSTALL_FILES: install-files/distbuild/manifest
     NFSBOOT_CONFIGURE: true
     TROVE_ID: $MY_TROVE
     WORKER_SSH_KEY: ssh-keys/worker.key
diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph
index 2a512709..e5e7b6ab 100644
--- a/clusters/example-swift-storage-cluster.morph
+++ b/clusters/example-swift-storage-cluster.morph
@@ -3,7 +3,7 @@ kind: cluster
 systems:
 - morph: systems/swift-system-x86_64.morph
   deploy-defaults:
-    INSTALL_FILES: swift/manifest
+    INSTALL_FILES: install-files/swift/manifest
 
     CONTROLLER_HOST_ADDRESS: <controller host address>
 
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index 915e14e7..935e2496 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -10,7 +10,7 @@ systems:
     CONTROLLERHOST: controller-hostname
     DISTBUILD_CONTROLLER: true
     DISTBUILD_WORKER: true
-    INSTALL_FILES: distbuild/manifest
+    INSTALL_FILES: install-files/distbuild/manifest
     RAM_SIZE: 8G
     TROVE_HOST: your-upstream-trove
     TROVE_ID: your-upstream-trove-prefix
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 21399ea0..376cf337 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -36,7 +36,7 @@ systems:
     CONTROLLERHOST: red-box-v1-controller.example.com
     DISTBUILD_CONTROLLER: false
     DISTBUILD_WORKER: true
-    INSTALL_FILES: distbuild/manifest
+    INSTALL_FILES: install-files/distbuild/manifest
     RAM_SIZE: 8G
     TROVE_HOST: upstream-trove
     TROVE_ID: upstream-trove
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index c46b1d9e..c6d62ca2 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -38,7 +38,7 @@ systems:
       HOSTNAME: installer-system-c31n1
       DTB_PATH: boot/m400-1003.dtb
       KERNEL_ARGS: console=ttyS0,9600n8r init=/usr/lib/baserock-installer/installer
-      INSTALL_FILES: moonshot/manifest
+      INSTALL_FILES: install-files/moonshot/manifest
       MOONSHOT_KERNEL: yes
   subsystems:
   - morph: systems/devel-system-armv8b64.morph
@@ -48,7 +48,7 @@ systems:
         location: /rootfs
         HOSTNAME: baserock-c31n1
         DTB_PATH: boot/m400-1003.dtb
-        INSTALL_FILES: moonshot/manifest
+        INSTALL_FILES: install-files/moonshot/manifest
         MOONSHOT_KERNEL: yes
         BOOT_DEVICE: /dev/sda1
         ROOT_DEVICE: /dev/sda2
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index a16a3602..ffee0392 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -26,5 +26,5 @@ systems:
       HOSTNAME: baserock-c31n1
       DTB_PATH: boot/m400-1003.dtb
       KERNEL_ARGS: console=ttyS0,9600n8r rw
-      INSTALL_FILES: moonshot/manifest
+      INSTALL_FILES: install-files/moonshot/manifest
       MOONSHOT_KERNEL: yes
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 9fd7cee7..62ee92a2 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -18,5 +18,5 @@ systems:
       DTB_PATH: boot/m400-1003.dtb
       HOSTNAME: baserock-m400-node31
       MOONSHOT_KERNEL: yes
-      INSTALL_FILES: moonshot/manifest
+      INSTALL_FILES: install-files/moonshot/manifest
       PXE_INSTALLER: no
diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph
index 37429283..de7066d6 100644
--- a/clusters/openstack-one-node-swift.morph
+++ b/clusters/openstack-one-node-swift.morph
@@ -43,7 +43,7 @@ systems:
       type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 10G
-      INSTALL_FILES: openstack/manifest swift/manifest
+      INSTALL_FILES: install-files/openstack/manifest install-files/swift/manifest
 
       HOSTNAME: onenode
 
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index d6b4c582..ab12f9b3 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -43,7 +43,7 @@ systems:
       type: extensions/rawdisk
       location: baserock-openstack-system-x86_64.img
       DISK_SIZE: 10G
-      INSTALL_FILES: openstack/manifest
+      INSTALL_FILES: install-files/openstack/manifest
 
       HOSTNAME: onenode
 
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index afad454a..a316a56c 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -79,7 +79,7 @@ systems:
       network-to-install: &stack-node
         type: extensions/sysroot
         location: rootfs
-        INSTALL_FILES: openstack/manifest
+        INSTALL_FILES: install-files/openstack/manifest
         INITRAMFS_PATH: boot/initramfs.gz
 
         HOSTNAME: threenode-network
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index 53d0b7b1..d4f94cfb 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -78,7 +78,7 @@ systems:
       controller-to-install: &stack-node
         type: extensions/sysroot
         location: rootfs
-        INSTALL_FILES: openstack/manifest
+        INSTALL_FILES: install-files/openstack/manifest
         INITRAMFS_PATH: boot/initramfs.gz
 
         HOSTNAME: twonode-controller