From a6bb02583c2523d921f6b79fd0b60b40ce4beb4d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 14 Nov 2014 10:59:52 -0500 Subject: [PATCH] os-net-config: use package-installs Updates the os-net-config element to use package-installs. Change-Id: I041891d928be160c82c681c3d548be5750cdb165 --- elements/os-net-config/element-deps | 1 + .../os-net-config-package-install/50-os-net-config-package | 4 ---- .../package-installs-os-net-config | 1 + elements/os-net-config/pkg-map | 5 +++++ 4 files changed, 7 insertions(+), 4 deletions(-) delete mode 100755 elements/os-net-config/install.d/os-net-config-package-install/50-os-net-config-package create 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/pkg-map diff --git a/elements/os-net-config/element-deps b/elements/os-net-config/element-deps index 166112e23..8002f76a1 100644 --- a/elements/os-net-config/element-deps +++ b/elements/os-net-config/element-deps @@ -1,4 +1,5 @@ os-apply-config os-refresh-config +package-installs pip-manifest openvswitch diff --git a/elements/os-net-config/install.d/os-net-config-package-install/50-os-net-config-package b/elements/os-net-config/install.d/os-net-config-package-install/50-os-net-config-package deleted file mode 100755 index be414073a..000000000 --- a/elements/os-net-config/install.d/os-net-config-package-install/50-os-net-config-package +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -install-packages os-net-config 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 new file mode 100644 index 000000000..45dc8a822 --- /dev/null +++ b/elements/os-net-config/install.d/os-net-config-package-install/package-installs-os-net-config @@ -0,0 +1 @@ +os_net_config_package diff --git a/elements/os-net-config/pkg-map b/elements/os-net-config/pkg-map new file mode 100644 index 000000000..d3551da6f --- /dev/null +++ b/elements/os-net-config/pkg-map @@ -0,0 +1,5 @@ +{ + "default": { + "os_net_config_package": "os-net-config" + } +}