summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openstack/classes/identity.bbclass2
-rw-r--r--meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend4
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass
index 07c8efc..b86eb76 100644
--- a/meta-openstack/classes/identity.bbclass
+++ b/meta-openstack/classes/identity.bbclass
@@ -1,3 +1,5 @@
1SERVICE_TOKEN = "password" 1SERVICE_TOKEN = "password"
2SERVICE_PASSWORD = "password" 2SERVICE_PASSWORD = "password"
3SERVICE_TENANT_NAME = "service" 3SERVICE_TENANT_NAME = "service"
4DB_USER = "admin"
5DB_PASSWORD = "admin"
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend
index a2390e4..98e7207 100644
--- a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend
+++ b/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend
@@ -3,7 +3,7 @@ PRINC := "${@int(PRINC) + 1}"
3 3
4SRC_URI += "file://postgresql" 4SRC_URI += "file://postgresql"
5 5
6inherit useradd update-rc.d 6inherit useradd update-rc.d identity
7 7
8do_install_append() { 8do_install_append() {
9 install -d ${D}${sysconfdir}/${PN} 9 install -d ${D}${sysconfdir}/${PN}
@@ -25,7 +25,7 @@ pkg_postinst_${PN} () {
25 25
26 sudo -u postgres initdb -D /etc/${PN}/ 26 sudo -u postgres initdb -D /etc/${PN}/
27 /etc/init.d/postgresql start 27 /etc/init.d/postgresql start
28 sudo -u postgres psql -c "CREATE ROLE admin WITH SUPERUSER LOGIN PASSWORD 'admin'" 28 sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'"
29 ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone 29 ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone
30} 30}
31 31