From db713fdf2d693676ad14e168f515a515ed52a95e Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Thu, 30 Jul 2015 19:58:51 +0000 Subject: [PATCH] Add ability to build ironic-python-agent ramdisk from packages Splits the install.d into source-install and package-install in order to allow building from a distro packaged version of ironic-python-agent. Change-Id: I17513c29efd8c199e07ac1ef20ea5d7456585413 --- .../package-installs-ironic-agent | 1 + .../{ => ironic-agent-source-install}/60-ironic-agent-install | 0 .../ironic-python-agent.conf | 0 .../ironic-python-agent.init | 0 .../ironic-python-agent.service | 0 elements/ironic-agent/pkg-map | 4 ++++ elements/ironic-agent/post-install.d/80-ironic-agent | 2 ++ 7 files changed, 7 insertions(+) create mode 100644 elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent rename elements/ironic-agent/install.d/{ => ironic-agent-source-install}/60-ironic-agent-install (100%) rename elements/ironic-agent/install.d/{ => ironic-agent-source-install}/ironic-python-agent.conf (100%) rename elements/ironic-agent/install.d/{ => ironic-agent-source-install}/ironic-python-agent.init (100%) rename elements/ironic-agent/install.d/{ => ironic-agent-source-install}/ironic-python-agent.service (100%) diff --git a/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent b/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent new file mode 100644 index 000000000..7e20b1dd9 --- /dev/null +++ b/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent @@ -0,0 +1 @@ +ironic-python-agent diff --git a/elements/ironic-agent/install.d/60-ironic-agent-install b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install similarity index 100% rename from elements/ironic-agent/install.d/60-ironic-agent-install rename to elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install diff --git a/elements/ironic-agent/install.d/ironic-python-agent.conf b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf similarity index 100% rename from elements/ironic-agent/install.d/ironic-python-agent.conf rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf diff --git a/elements/ironic-agent/install.d/ironic-python-agent.init b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init similarity index 100% rename from elements/ironic-agent/install.d/ironic-python-agent.init rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init diff --git a/elements/ironic-agent/install.d/ironic-python-agent.service b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service similarity index 100% rename from elements/ironic-agent/install.d/ironic-python-agent.service rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service diff --git a/elements/ironic-agent/pkg-map b/elements/ironic-agent/pkg-map index 636567b6c..c0242ef6d 100644 --- a/elements/ironic-agent/pkg-map +++ b/elements/ironic-agent/pkg-map @@ -2,14 +2,17 @@ "distro": { "rhel": { "tgt": "targetcli" + "ironic-python-agent": "openstack-ironic-python-agent" }, "centos":{ "tgt": "scsi-target-utils" + "ironic-python-agent": "openstack-ironic-python-agent" } }, "family": { "redhat": { "tgt": "scsi-target-utils" + "ironic-python-agent": "openstack-ironic-python-agent" }, "debian": { "tgt": "tgt" @@ -17,5 +20,6 @@ }, "default": { "tgt": "tgt" + "ironic-python-agent": "openstack-ironic-python-agent" } } diff --git a/elements/ironic-agent/post-install.d/80-ironic-agent b/elements/ironic-agent/post-install.d/80-ironic-agent index 440f161cf..72811d8f0 100755 --- a/elements/ironic-agent/post-install.d/80-ironic-agent +++ b/elements/ironic-agent/post-install.d/80-ironic-agent @@ -17,9 +17,11 @@ case "$DIB_INIT_SYSTEM" in ;; systemd) systemctl disable iptables.service + systemctl enable openstack-ironic-python-agent.service ;; sysv) update-rc.d iptables disable + update-rc.d openstack-ironic-python-agent enable ;; *) echo "Unsupported init system"