From 2cbaea79948d15d3ab8249ee5b0c95dbbe43a5a2 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 5 Feb 2014 16:37:29 -0500 Subject: [PATCH] Fix neutron package install Previously the neutron element was installing neutron-server. This should actually be happening in the neutron-server element itself. Likewise, the neutron-dhcp-agent should also install the package it needs. In both cases, the package is just openstack-neutron, but only the intended services will be enabled and started due to the os-refresh-config scripts. E.g., if you only include neutron-dhcp-agent, and not neuton-server, only the neutron-dhcp-agent will be enabled. Change-Id: I11e52e9cdd6062b03d389971acad1c52a9cc3ea8 --- .../neutron-package-install/80-neutron-dhcp-agent | 7 +++++++ .../install.d/neutron-package-install/76-neutron | 0 2 files changed, 7 insertions(+) create mode 100644 elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent rename elements/{neutron => neutron-server}/install.d/neutron-package-install/76-neutron (100%) diff --git a/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent new file mode 100644 index 000000000..e642e5920 --- /dev/null +++ b/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent @@ -0,0 +1,7 @@ +#!/bin/bash + +set -eux + +install-packages openstack-neutron + +os-svc-daemon -n neutron-dhcp-agent -u neutron -c noop -d diff --git a/elements/neutron/install.d/neutron-package-install/76-neutron b/elements/neutron-server/install.d/neutron-package-install/76-neutron similarity index 100% rename from elements/neutron/install.d/neutron-package-install/76-neutron rename to elements/neutron-server/install.d/neutron-package-install/76-neutron