From 25509120b4f35d3f02b679d474ee12587a6c3bbc Mon Sep 17 00:00:00 2001 From: James Slagle Date: Sun, 1 Mar 2015 14:19:30 -0500 Subject: [PATCH] Migrate os-*-config to package-installs v2 Migrate all the os-*-config elements to package-installs v2. Change-Id: I9e48a021faa3dde7789a788618e96612e85eb0c4 --- .../package-installs-os-apply-config | 1 - elements/os-apply-config/package-installs.yaml | 2 ++ .../os-cloud-config-package-install/90-os-cloud-config | 6 ------ elements/os-cloud-config/package-installs.yaml | 2 ++ .../package-installs-os-collect-config | 1 - .../package-installs-os-collect-config | 5 ----- elements/os-collect-config/package-installs.yaml | 7 +++++++ .../package-installs-os-net-config | 1 - elements/os-net-config/package-installs.yaml | 2 ++ .../package-installs-os-refresh-config | 1 - .../install.d/package-installs-os-refresh-config | 1 - elements/os-refresh-config/package-installs.yaml | 3 +++ 12 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config create mode 100644 elements/os-apply-config/package-installs.yaml delete mode 100755 elements/os-cloud-config/install.d/os-cloud-config-package-install/90-os-cloud-config create mode 100644 elements/os-cloud-config/package-installs.yaml delete mode 100644 elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config delete mode 100644 elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config create mode 100644 elements/os-collect-config/package-installs.yaml delete mode 100644 elements/os-net-config/install.d/os-net-config-package-install/package-installs-os-net-config create mode 100644 elements/os-net-config/package-installs.yaml delete mode 100644 elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config delete mode 100644 elements/os-refresh-config/install.d/package-installs-os-refresh-config create mode 100644 elements/os-refresh-config/package-installs.yaml diff --git a/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config deleted file mode 100644 index b0a0c5d7d..000000000 --- a/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config +++ /dev/null @@ -1 +0,0 @@ -os-apply-config diff --git a/elements/os-apply-config/package-installs.yaml b/elements/os-apply-config/package-installs.yaml new file mode 100644 index 000000000..4d6f6887e --- /dev/null +++ b/elements/os-apply-config/package-installs.yaml @@ -0,0 +1,2 @@ +os-apply-config: + installtype: package diff --git a/elements/os-cloud-config/install.d/os-cloud-config-package-install/90-os-cloud-config b/elements/os-cloud-config/install.d/os-cloud-config-package-install/90-os-cloud-config deleted file mode 100755 index 883743e3f..000000000 --- a/elements/os-cloud-config/install.d/os-cloud-config-package-install/90-os-cloud-config +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -install-packages os-cloud-config diff --git a/elements/os-cloud-config/package-installs.yaml b/elements/os-cloud-config/package-installs.yaml new file mode 100644 index 000000000..e21fe2c83 --- /dev/null +++ b/elements/os-cloud-config/package-installs.yaml @@ -0,0 +1,2 @@ +os-cloud-config: + installtype: package diff --git a/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config deleted file mode 100644 index 651d8919a..000000000 --- a/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config +++ /dev/null @@ -1 +0,0 @@ -os-collect-config diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config deleted file mode 100644 index c57518b4e..000000000 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config +++ /dev/null @@ -1,5 +0,0 @@ -build-essential -libxml2-dev -libz-dev -libxslt-dev -python-dev diff --git a/elements/os-collect-config/package-installs.yaml b/elements/os-collect-config/package-installs.yaml new file mode 100644 index 000000000..1be44cf8d --- /dev/null +++ b/elements/os-collect-config/package-installs.yaml @@ -0,0 +1,7 @@ +os-collect-config: + installtype: package +build-essential: +libxml2-dev: +libz-dev: +libxslt-dev: +python-dev: diff --git a/elements/os-net-config/install.d/os-net-config-package-install/package-installs-os-net-config b/elements/os-net-config/install.d/os-net-config-package-install/package-installs-os-net-config deleted file mode 100644 index 0051e0d7e..000000000 --- a/elements/os-net-config/install.d/os-net-config-package-install/package-installs-os-net-config +++ /dev/null @@ -1 +0,0 @@ -os-net-config diff --git a/elements/os-net-config/package-installs.yaml b/elements/os-net-config/package-installs.yaml new file mode 100644 index 000000000..086cb9029 --- /dev/null +++ b/elements/os-net-config/package-installs.yaml @@ -0,0 +1,2 @@ +os-net-config: + installtype: package diff --git a/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config deleted file mode 100644 index 33d7e82b2..000000000 --- a/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config +++ /dev/null @@ -1 +0,0 @@ -os-refresh-config diff --git a/elements/os-refresh-config/install.d/package-installs-os-refresh-config b/elements/os-refresh-config/install.d/package-installs-os-refresh-config deleted file mode 100644 index ca782881f..000000000 --- a/elements/os-refresh-config/install.d/package-installs-os-refresh-config +++ /dev/null @@ -1 +0,0 @@ -jq diff --git a/elements/os-refresh-config/package-installs.yaml b/elements/os-refresh-config/package-installs.yaml new file mode 100644 index 000000000..c1efd395b --- /dev/null +++ b/elements/os-refresh-config/package-installs.yaml @@ -0,0 +1,3 @@ +jq: +os-refresh-config: + installtype: package