From e617d0205fc566ef70b61a75c484d78c540ef791 Mon Sep 17 00:00:00 2001 From: Vu Tran Date: Fri, 28 Feb 2014 09:11:13 -0500 Subject: Readjust the start level of openstack components Currently all the openstack components have default start level of 20. There are other services such as glusterfs, rabbbitmq, database... are also starting at the same start level. On some platform, this can cause racing condition between services which in turn causes some of openstack components not started. By adjusting the openstack components start level to higher will ensure that system services start in the determistic way. Signed-off-by: Vu Tran Signed-off-by: Bruce Ashfield --- meta-openstack/classes/default_configs.bbclass | 1 + .../recipes-devtools/python/python-ceilometer_git.bb | 8 +++++++- meta-openstack/recipes-devtools/python/python-cinder_git.bb | 5 ++++- meta-openstack/recipes-devtools/python/python-glance_git.bb | 4 +++- meta-openstack/recipes-devtools/python/python-heat_git.bb | 5 ++++- meta-openstack/recipes-devtools/python/python-horizon_git.bb | 3 ++- meta-openstack/recipes-devtools/python/python-keystone_git.bb | 3 ++- meta-openstack/recipes-devtools/python/python-neutron_git.bb | 5 ++++- meta-openstack/recipes-devtools/python/python-nova_git.bb | 10 +++++++++- 9 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 meta-openstack/classes/default_configs.bbclass (limited to 'meta-openstack') diff --git a/meta-openstack/classes/default_configs.bbclass b/meta-openstack/classes/default_configs.bbclass new file mode 100644 index 0000000..2be586c --- /dev/null +++ b/meta-openstack/classes/default_configs.bbclass @@ -0,0 +1 @@ +OS_DEFAULT_INITSCRIPT_PARAMS ??= "defaults 30 10" diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index e67f2bf..7d1796d 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -90,7 +90,7 @@ pkg_postinst_${SRCNAME}-setup () { ceilometer-dbsync } -inherit setuptools identity hosts update-rc.d +inherit setuptools identity hosts update-rc.d default_configs PACKAGES += " ${SRCNAME}-tests" PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" @@ -193,8 +193,14 @@ RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator" INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" +INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector" +INITSCRIPT_PARAMS_${SRCNAME}-collector = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-compute = "${SRCNAME}-agent-compute" +INITSCRIPT_PARAMS_${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-controller = "${SRCNAME}-agent-central" +INITSCRIPT_PARAMS_${SRCNAME}-controller = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier" +INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator" +INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 6fb27f8..c2479f7 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -20,7 +20,7 @@ SRCREV="8b5fb8409322f61d8b610c97c109a61bf48a940e" PV="2013.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d identity +inherit setuptools update-rc.d identity default_configs do_install_append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} @@ -166,5 +166,8 @@ RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler" INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api" +INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume" +INITSCRIPT_PARAMS_${SRCNAME}-volume = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler" +INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 1bd24d0..3ccb860 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -16,7 +16,7 @@ PV="2013.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d identity +inherit setuptools update-rc.d identity default_configs do_install_append() { TEMPLATE_CONF_DIR=${S}${sysconfdir} @@ -137,4 +137,6 @@ RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry" INITSCRIPT_NAME_${SRCNAME}-api = "glance-api" +INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-registry = "glance-registry" +INITSCRIPT_PARAMS_${SRCNAME}-registry = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 4c12551..6fa6c36 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -80,7 +80,7 @@ pkg_postinst_${SRCNAME}-setup () { heat-manage db_sync } -inherit setuptools identity hosts update-rc.d +inherit setuptools identity hosts update-rc.d default_configs PACKAGES += "${SRCNAME}-tests ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" PACKAGES += "${SRCNAME}-setup" @@ -164,6 +164,9 @@ RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" +INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn" +INITSCRIPT_PARAMS_${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-engine = "${SRCNAME}-engine" +INITSCRIPT_PARAMS_${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index be45a2b..771f000 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -39,7 +39,7 @@ SRCREV="1912cc6a88dca7238da7c444a1ede84b983ab354" PV="2013.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d python-dir +inherit setuptools update-rc.d python-dir default_configs # no longer required. kept as reference. # do_install[dirs] += "${D}/usr/share/bin" @@ -112,3 +112,4 @@ RDEPENDS_${SRCNAME} = "${PN}" INITSCRIPT_PACKAGES = "${SRCNAME}" INITSCRIPT_NAME_${SRCNAME} = "horizon" +INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index bb44fe4..6966d07 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -20,7 +20,7 @@ PV="2013.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d identity hosts +inherit setuptools update-rc.d identity hosts default_configs SERVICE_TOKEN = "password" @@ -143,3 +143,4 @@ RDEPENDS_${SRCNAME}-cronjobs = "cronie ${SRCNAME}" INITSCRIPT_PACKAGES = "${SRCNAME}" INITSCRIPT_NAME_${SRCNAME} = "keystone" +INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 4aa974e..4e3c1b8 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -18,7 +18,7 @@ PV="2013.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d identity hosts +inherit setuptools update-rc.d identity hosts default_configs do_install_append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/ @@ -204,5 +204,8 @@ RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" INITSCRIPT_PACKAGES = "${SRCNAME}-server ${SRCNAME}-plugin-openvswitch ${SRCNAME}-plugin-linuxbridge" INITSCRIPT_NAME_${SRCNAME}-server = "neutron-server" +INITSCRIPT_PARAMS_${SRCNAME}-server = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" +INITSCRIPT_PARAMS_${SRCNAME}-plugin-openvswitch = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-plugin-linuxbridge = "neutron-linuxbridge-agent" +INITSCRIPT_PARAMS_${SRCNAME}-plugin-linuxbridge = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index e41e796..7f3d2e2 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -28,7 +28,7 @@ PV="2013.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit update-rc.d setuptools identity hosts useradd +inherit update-rc.d setuptools identity hosts useradd default_configs do_install_append() { if [ ! -f "${WORKDIR}/nova.conf" ]; then @@ -268,12 +268,20 @@ INITSCRIPT_PACKAGES += "${SRCNAME}-api" # INITSCRIPT_PACKAGES += "${SRCNAME}-controller" # INITSCRIPT_NAME_${SRCNAME}-controller = "nova-all" INITSCRIPT_NAME_${SRCNAME}-network = "nova-network" +INITSCRIPT_PARAMS_${SRCNAME}-network = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-scheduler = "nova-scheduler" +INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-cert = "nova-cert" +INITSCRIPT_PARAMS_${SRCNAME}-cert = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-conductor = "nova-conductor" +INITSCRIPT_PARAMS_${SRCNAME}-conductor = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-api = "nova-api" +INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-compute = "nova-compute" +INITSCRIPT_PARAMS_${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-consoleauth = "nova-consoleauth" +INITSCRIPT_PARAMS_${SRCNAME}-consoleauth = "${OS_DEFAULT_INITSCRIPT_PARAMS}" INITSCRIPT_NAME_${SRCNAME}-novncproxy = "nova-novncproxy" +INITSCRIPT_PARAMS_${SRCNAME}-novncproxy = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -- cgit v1.2.3-54-g00ecf