diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-30 16:53:53 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-30 16:54:49 -0500 |
| commit | b9d3786c6671e5f3b4ad54bc468dc79b1e5adae0 (patch) | |
| tree | f1d37e2798838fbc86bee9eb764c4d5303216fb0 /meta-openstack | |
| parent | a71362127628ef736d70f0009851cd1fe51c9fb8 (diff) | |
| download | meta-cloud-services-b9d3786c6671e5f3b4ad54bc468dc79b1e5adae0.tar.gz | |
nova: add migrate.cfg to the manifest
To properly sync the nova database during boot, the migrate.cfg must be
present in the rootfs.
This wasn't currently being packaged, so we add it to the manifest.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch | 24 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch new file mode 100644 index 0000000..25aa07e --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | From 019f6c2d838aefa9b625bd7a5eadb031fca735cd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Mon, 27 Jan 2014 16:06:16 -0500 | ||
| 4 | Subject: [PATCH] nova: add migrate.cfg to the MANIFEST | ||
| 5 | |||
| 6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 7 | --- | ||
| 8 | MANIFEST.in | 1 + | ||
| 9 | 1 file changed, 1 insertion(+) | ||
| 10 | |||
| 11 | diff --git a/MANIFEST.in b/MANIFEST.in | ||
| 12 | index c978a52dae21..61e522c610d6 100644 | ||
| 13 | --- a/MANIFEST.in | ||
| 14 | +++ b/MANIFEST.in | ||
| 15 | @@ -1,5 +1,6 @@ | ||
| 16 | include AUTHORS | ||
| 17 | include ChangeLog | ||
| 18 | +include nova/db/sqlalchemy/migrate_repo/migrate.cfg | ||
| 19 | exclude .gitignore | ||
| 20 | exclude .gitreview | ||
| 21 | |||
| 22 | -- | ||
| 23 | 1.7.10.4 | ||
| 24 | |||
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 5c438e1..4770448 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
| @@ -13,6 +13,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}" | |||
| 13 | 13 | ||
| 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ |
| 15 | file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \ | 15 | file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \ |
| 16 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | SRC_URI += "file://nova-all \ | 19 | SRC_URI += "file://nova-all \ |
