diff options
8 files changed, 43 insertions, 6 deletions
diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup index d55883fb..b02ebf69 100644 --- a/meta-openstack/README.setup +++ b/meta-openstack/README.setup @@ -84,6 +84,20 @@ to the bblayers.conf file: /meta-openembedded/meta-webserver \ /meta-openembedded/meta-ruby +* All images must use systemd init system. After the builddir has been +initialized you have to append the necessary variables to ensure that +systemd will be used in your images: + + DISTRO_FEATURES_append = " systemd" + DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" + VIRTUAL-RUNTIME_init_manager = "systemd" + VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" + +Additionally activiate the meta-virtualization layer: + + DISTRO_FEATURES_append += "virtualization kvm" + + Package configurations ---------------------- diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 9f70bebb..3523038e 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -152,6 +152,10 @@ pkg_postinst_${SRCNAME}-setup () { PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" ALLOW_EMPTY_${SRCNAME}-setup = "1" +ALLOW_EMPTY_${SRCNAME}-backup = "1" +ALLOW_EMPTY_${SRCNAME}-scheduler = "1" +ALLOW_EMPTY_${SRCNAME}-volume = "1" +ALLOW_EMPTY_${SRCNAME}-api = "1" RDEPENDS_${SRCNAME}-tests += " bash python" diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 4042f1b7..4c408c93 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -138,6 +138,8 @@ pkg_postinst_${SRCNAME}-setup () { PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" ALLOW_EMPTY_${SRCNAME}-setup = "1" +ALLOW_EMPTY_${SRCNAME}-registry = "1" +ALLOW_EMPTY_${SRCNAME}-api = "1" FILES_${PN} = " \ ${libdir}/* \ diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 69d19f57..51025e79 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -147,6 +147,7 @@ do_install_append() { } PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone" +ALLOW_EMPTY_${SRCNAME}-standalone = "1" RDEPENDS_${SRCNAME}-tests += " bash" diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index a26c9bfb..b5f92dd2 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -128,12 +128,12 @@ do_install_append() { sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" \ -i ${KEYSTONE_CONF_DIR}/keystone.conf - sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ - -i ${D}${sysconfdir}/init.d/keystone - sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ - -i ${D}${sysconfdir}/init.d/keystone - sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ - -i ${D}${sysconfdir}/init.d/keystone +# sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ +# -i ${D}${sysconfdir}/init.d/keystone +# sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ +# -i ${D}${sysconfdir}/init.d/keystone +# sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ +# -i ${D}${sysconfdir}/init.d/keystone install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index c837401e..f2a4baaf 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -56,6 +56,7 @@ do_install_append() { install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/ install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/ install -m 600 ${TEMPLATE_CONF_DIR}/neutron/plugins/ml2/* ${NEUTRON_CONF_DIR}/plugins/ml2 + install -m 600 ${WORKDIR}/metadata_agent.ini ${NEUTRON_CONF_DIR}/ # Neutron.conf config changes (replace with .ini file editing) sed -e "s:^# core_plugin.*:core_plugin = ml2:g" -i ${NEUTRON_CONF_DIR}/neutron.conf diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 7b560a73..115d198d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -212,6 +212,18 @@ FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" ALLOW_EMPTY_${SRCNAME}-setup = "1" ALLOW_EMPTY_${SRCNAME}-ec2 = "1" +ALLOW_EMPTY_${SRCNAME}-api = "1" +ALLOW_EMPTY_${SRCNAME}-compute = "1" +ALLOW_EMPTY_${SRCNAME}-controller = "1" +ALLOW_EMPTY_${SRCNAME}-consoleauth = "1" +ALLOW_EMPTY_${SRCNAME}-cert = "1" +ALLOW_EMPTY_${SRCNAME}-conductor = "1" +ALLOW_EMPTY_${SRCNAME}-network = "1" +ALLOW_EMPTY_${SRCNAME}-novncproxy = "1" +ALLOW_EMPTY_${SRCNAME}-scheduler = "1" +ALLOW_EMPTY_${SRCNAME}-spicehtml5proxy = "1" + + FILES_${PN} = "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index b90e552b..e1f8ae0b 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb @@ -210,6 +210,7 @@ FILES_${SRCNAME} = " \ FILES_${SRCNAME}-api = " \ ${sysconfdir}/init.d/trove-api \ " +ALLOW_EMPTY_${SRCNAME}-api = "1" FILES_${SRCNAME}-bin = " \ ${bindir}/* \ @@ -218,10 +219,12 @@ FILES_${SRCNAME}-bin = " \ FILES_${SRCNAME}-conductor = " \ ${sysconfdir}/init.d/trove-conductor \ " +ALLOW_EMPTY_${SRCNAME}-conductor = "1" FILES_${SRCNAME}-taskmanager = " \ ${sysconfdir}/init.d/trove-taskmanager \ " +ALLOW_EMPTY_${SRCNAME}-taskmanager = "1" FILES_${SRCNAME}-setup = " \ ${localstatedir}/* \ |