diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-10-04 00:27:53 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-10-04 13:16:33 -0400 |
commit | 608fa75973c111c61cf55e99cf3172ff3f3f00b1 (patch) | |
tree | fa3b3a3d457dc1daafdefa5c100379bcf3de1928 /meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb | |
parent | 6806482a7ba6f020b0cff44b2b797eede2b702af (diff) | |
download | meta-cloud-services-608fa75973c111c61cf55e99cf3172ff3f3f00b1.tar.gz |
postgresql: unify startup and initialization
Since we can't count on package postinst order, many components check for
a configured postgresql daemon, and if not found, initialize it.
Rather than sprinkling the knowledge of how to initialize the database
through all these packages, we create a more robust, central postgresql-init
script, and call it when any component needs the database configured.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb index c2dd1f3..3552592 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-$ | |||
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI += "file://nova-all \ | 18 | SRC_URI += "file://nova-all \ |
19 | file://nova-compute \ | ||
19 | file://nova-consoleauth \ | 20 | file://nova-consoleauth \ |
20 | file://nova-novncproxy \ | 21 | file://nova-novncproxy \ |
21 | file://nova.conf \ | 22 | file://nova.conf \ |
@@ -93,6 +94,7 @@ do_install_append() { | |||
93 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 94 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
94 | install -d ${D}${sysconfdir}/init.d | 95 | install -d ${D}${sysconfdir}/init.d |
95 | install -m 0755 ${WORKDIR}/nova-all ${D}${sysconfdir}/init.d/nova-all | 96 | install -m 0755 ${WORKDIR}/nova-all ${D}${sysconfdir}/init.d/nova-all |
97 | install -m 0755 ${WORKDIR}/nova-compute ${D}${sysconfdir}/init.d/nova-compute | ||
96 | install -m 0755 ${WORKDIR}/nova-consoleauth ${D}${sysconfdir}/init.d/nova-consoleauth | 98 | install -m 0755 ${WORKDIR}/nova-consoleauth ${D}${sysconfdir}/init.d/nova-consoleauth |
97 | install -m 0755 ${WORKDIR}/nova-novncproxy ${D}${sysconfdir}/init.d/nova-novncproxy | 99 | install -m 0755 ${WORKDIR}/nova-novncproxy ${D}${sysconfdir}/init.d/nova-novncproxy |
98 | fi | 100 | fi |
@@ -197,14 +199,15 @@ RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ | |||
197 | iptables curl dnsmasq sudo procps" | 199 | iptables curl dnsmasq sudo procps" |
198 | 200 | ||
199 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ | 201 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ |
200 | ${SRCNAME}-consoleauth \ | 202 | ${SRCNAME}-consoleauth \ |
201 | ${SRCNAME}-novncproxy \ | 203 | ${SRCNAME}-novncproxy \ |
202 | postgresql postgresql-client python-psycopg2" | 204 | postgresql postgresql-client python-psycopg2" |
203 | 205 | ||
204 | RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common \ | 206 | RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common \ |
205 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" | 207 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" |
206 | 208 | ||
207 | INITSCRIPT_PACKAGES = "${SRCNAME}-controller ${SRCNAME}-consoleauth ${SRCNAME}-novncproxy" | 209 | INITSCRIPT_PACKAGES = "${SRCNAME}-compute ${SRCNAME}-controller ${SRCNAME}-consoleauth ${SRCNAME}-novncproxy" |
208 | INITSCRIPT_NAME_${SRCNAME}-controller = "nova-all" | 210 | INITSCRIPT_NAME_${SRCNAME}-controller = "nova-all" |
211 | INITSCRIPT_NAME_${SRCNAME}-compute = "nova-compute" | ||
209 | INITSCRIPT_NAME_${SRCNAME}-consoleauth = "nova-consoleauth" | 212 | INITSCRIPT_NAME_${SRCNAME}-consoleauth = "nova-consoleauth" |
210 | INITSCRIPT_NAME_${SRCNAME}-novncproxy = "nova-novncproxy" | 213 | INITSCRIPT_NAME_${SRCNAME}-novncproxy = "nova-novncproxy" |