diff options
Diffstat (limited to 'meta-openstack')
8 files changed, 43 insertions, 6 deletions
diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup index d55883f..b02ebf6 100644 --- a/meta-openstack/README.setup +++ b/meta-openstack/README.setup | |||
@@ -84,6 +84,20 @@ to the bblayers.conf file: | |||
84 | /meta-openembedded/meta-webserver \ | 84 | /meta-openembedded/meta-webserver \ |
85 | /meta-openembedded/meta-ruby | 85 | /meta-openembedded/meta-ruby |
86 | 86 | ||
87 | * All images must use systemd init system. After the builddir has been | ||
88 | initialized you have to append the necessary variables to ensure that | ||
89 | systemd will be used in your images: | ||
90 | |||
91 | DISTRO_FEATURES_append = " systemd" | ||
92 | DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" | ||
93 | VIRTUAL-RUNTIME_init_manager = "systemd" | ||
94 | VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" | ||
95 | |||
96 | Additionally activiate the meta-virtualization layer: | ||
97 | |||
98 | DISTRO_FEATURES_append += "virtualization kvm" | ||
99 | |||
100 | |||
87 | Package configurations | 101 | Package configurations |
88 | ---------------------- | 102 | ---------------------- |
89 | 103 | ||
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 9f70beb..3523038 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 () { | |||
152 | 152 | ||
153 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" | 153 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" |
154 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 154 | ALLOW_EMPTY_${SRCNAME}-setup = "1" |
155 | ALLOW_EMPTY_${SRCNAME}-backup = "1" | ||
156 | ALLOW_EMPTY_${SRCNAME}-scheduler = "1" | ||
157 | ALLOW_EMPTY_${SRCNAME}-volume = "1" | ||
158 | ALLOW_EMPTY_${SRCNAME}-api = "1" | ||
155 | 159 | ||
156 | RDEPENDS_${SRCNAME}-tests += " bash python" | 160 | RDEPENDS_${SRCNAME}-tests += " bash python" |
157 | 161 | ||
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 4042f1b..4c408c9 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 () { | |||
138 | 138 | ||
139 | PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" | 139 | PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" |
140 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 140 | ALLOW_EMPTY_${SRCNAME}-setup = "1" |
141 | ALLOW_EMPTY_${SRCNAME}-registry = "1" | ||
142 | ALLOW_EMPTY_${SRCNAME}-api = "1" | ||
141 | 143 | ||
142 | FILES_${PN} = " \ | 144 | FILES_${PN} = " \ |
143 | ${libdir}/* \ | 145 | ${libdir}/* \ |
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 69d19f5..51025e7 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() { | |||
147 | } | 147 | } |
148 | 148 | ||
149 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone" | 149 | PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone" |
150 | ALLOW_EMPTY_${SRCNAME}-standalone = "1" | ||
150 | 151 | ||
151 | RDEPENDS_${SRCNAME}-tests += " bash" | 152 | RDEPENDS_${SRCNAME}-tests += " bash" |
152 | 153 | ||
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index a26c9bf..b5f92dd 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() { | |||
128 | sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" \ | 128 | sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" \ |
129 | -i ${KEYSTONE_CONF_DIR}/keystone.conf | 129 | -i ${KEYSTONE_CONF_DIR}/keystone.conf |
130 | 130 | ||
131 | sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ | 131 | # sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ |
132 | -i ${D}${sysconfdir}/init.d/keystone | 132 | # -i ${D}${sysconfdir}/init.d/keystone |
133 | sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ | 133 | # sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ |
134 | -i ${D}${sysconfdir}/init.d/keystone | 134 | # -i ${D}${sysconfdir}/init.d/keystone |
135 | sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ | 135 | # sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ |
136 | -i ${D}${sysconfdir}/init.d/keystone | 136 | # -i ${D}${sysconfdir}/init.d/keystone |
137 | 137 | ||
138 | install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp | 138 | install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp |
139 | 139 | ||
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index c837401..f2a4baa 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() { | |||
56 | install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/ | 56 | install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/ |
57 | install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/ | 57 | install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/ |
58 | install -m 600 ${TEMPLATE_CONF_DIR}/neutron/plugins/ml2/* ${NEUTRON_CONF_DIR}/plugins/ml2 | 58 | install -m 600 ${TEMPLATE_CONF_DIR}/neutron/plugins/ml2/* ${NEUTRON_CONF_DIR}/plugins/ml2 |
59 | install -m 600 ${WORKDIR}/metadata_agent.ini ${NEUTRON_CONF_DIR}/ | ||
59 | 60 | ||
60 | # Neutron.conf config changes (replace with .ini file editing) | 61 | # Neutron.conf config changes (replace with .ini file editing) |
61 | sed -e "s:^# core_plugin.*:core_plugin = ml2:g" -i ${NEUTRON_CONF_DIR}/neutron.conf | 62 | 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 7b560a7..115d198 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/*" | |||
212 | 212 | ||
213 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 213 | ALLOW_EMPTY_${SRCNAME}-setup = "1" |
214 | ALLOW_EMPTY_${SRCNAME}-ec2 = "1" | 214 | ALLOW_EMPTY_${SRCNAME}-ec2 = "1" |
215 | ALLOW_EMPTY_${SRCNAME}-api = "1" | ||
216 | ALLOW_EMPTY_${SRCNAME}-compute = "1" | ||
217 | ALLOW_EMPTY_${SRCNAME}-controller = "1" | ||
218 | ALLOW_EMPTY_${SRCNAME}-consoleauth = "1" | ||
219 | ALLOW_EMPTY_${SRCNAME}-cert = "1" | ||
220 | ALLOW_EMPTY_${SRCNAME}-conductor = "1" | ||
221 | ALLOW_EMPTY_${SRCNAME}-network = "1" | ||
222 | ALLOW_EMPTY_${SRCNAME}-novncproxy = "1" | ||
223 | ALLOW_EMPTY_${SRCNAME}-scheduler = "1" | ||
224 | ALLOW_EMPTY_${SRCNAME}-spicehtml5proxy = "1" | ||
225 | |||
226 | |||
215 | 227 | ||
216 | FILES_${PN} = "${libdir}/*" | 228 | FILES_${PN} = "${libdir}/*" |
217 | 229 | ||
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index b90e552..e1f8ae0 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} = " \ | |||
210 | FILES_${SRCNAME}-api = " \ | 210 | FILES_${SRCNAME}-api = " \ |
211 | ${sysconfdir}/init.d/trove-api \ | 211 | ${sysconfdir}/init.d/trove-api \ |
212 | " | 212 | " |
213 | ALLOW_EMPTY_${SRCNAME}-api = "1" | ||
213 | 214 | ||
214 | FILES_${SRCNAME}-bin = " \ | 215 | FILES_${SRCNAME}-bin = " \ |
215 | ${bindir}/* \ | 216 | ${bindir}/* \ |
@@ -218,10 +219,12 @@ FILES_${SRCNAME}-bin = " \ | |||
218 | FILES_${SRCNAME}-conductor = " \ | 219 | FILES_${SRCNAME}-conductor = " \ |
219 | ${sysconfdir}/init.d/trove-conductor \ | 220 | ${sysconfdir}/init.d/trove-conductor \ |
220 | " | 221 | " |
222 | ALLOW_EMPTY_${SRCNAME}-conductor = "1" | ||
221 | 223 | ||
222 | FILES_${SRCNAME}-taskmanager = " \ | 224 | FILES_${SRCNAME}-taskmanager = " \ |
223 | ${sysconfdir}/init.d/trove-taskmanager \ | 225 | ${sysconfdir}/init.d/trove-taskmanager \ |
224 | " | 226 | " |
227 | ALLOW_EMPTY_${SRCNAME}-taskmanager = "1" | ||
225 | 228 | ||
226 | FILES_${SRCNAME}-setup = " \ | 229 | FILES_${SRCNAME}-setup = " \ |
227 | ${localstatedir}/* \ | 230 | ${localstatedir}/* \ |