sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[ironic-agent] Use svc-map for enabling agent"

Browse Source
This commit is contained in:
Jenkins 2015-09-03 15:05:24 +00:00 committed by Gerrit Code Review
commit b2fd0f3ad7
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/ironic-agent/README.rst
View File

@ -16,5 +16,10 @@ Beyond installing the ironic-python-agent, this element does the following:
in order to support source based installation of ironic-python-agent and its in order to support source based installation of ironic-python-agent and its
dependencies. dependencies.
.. note::
The package based install currently only enables the service when using the
systemd init system. This can easily be changed if there is an agent
package which includes upstart or sysv packaging.
.. note:: .. note::
Using the ramdisk will require at least 1.5GB of ram Using the ramdisk will require at least 1.5GB of ram

3
elements/ironic-agent/element-deps
View File

@ -1,2 +1,5 @@
dhcp-all-interfaces dhcp-all-interfaces
package-installs
pkg-map
source-repositories source-repositories
svc-map

3
elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
View File

@ -28,8 +28,7 @@ case "$DIB_INIT_SYSTEM" in
install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.conf /etc/init/ironic-python-agent.conf install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.conf /etc/init/ironic-python-agent.conf
;; ;;
systemd) systemd)
install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.service /usr/lib/systemd/system/ironic-python-agent.service install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.service /usr/lib/systemd/system/$(svc-map ironic-python-agent).service
systemctl enable ironic-python-agent.service
;; ;;
sysv) sysv)
install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.init /etc/init.d/ironic-python-agent.init install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.init /etc/init.d/ironic-python-agent.init

2
elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf
View File

@ -14,7 +14,7 @@ umask 022
expect stop expect stop
pre-start script pre-start script
echo Starting Ironic Python Agnet echo Starting Ironic Python Agent
end script end script
exec /usr/bin/ironic-python-agent exec /usr/bin/ironic-python-agent

3
elements/ironic-agent/post-install.d/80-ironic-agent
View File

@ -23,11 +23,10 @@ case "$DIB_INIT_SYSTEM" in
;; ;;
systemd) systemd)
systemctl disable iptables.service systemctl disable iptables.service
systemctl enable openstack-ironic-python-agent.service systemctl enable $(svc-map ironic-python-agent).service
;; ;;
sysv) sysv)
update-rc.d iptables disable update-rc.d iptables disable
update-rc.d openstack-ironic-python-agent enable
;; ;;
*) *)
echo "Unsupported init system" echo "Unsupported init system"

4
elements/ironic-agent/svc-map Normal file
View File

@ -0,0 +1,4 @@
ironic-python-agent:
default: openstack-ironic-python-agent
redhat: openstack-ironic-python-agent
debian: ironic-python-agent