diff options
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/classes/identity.bbclass | 1 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone_2013.1.bb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass index b86eb76..d1eb276 100644 --- a/meta-openstack/classes/identity.bbclass +++ b/meta-openstack/classes/identity.bbclass | |||
@@ -1,4 +1,5 @@ | |||
1 | SERVICE_TOKEN = "password" | 1 | SERVICE_TOKEN = "password" |
2 | ADMIN_PASSWORD = "password" | ||
2 | SERVICE_PASSWORD = "password" | 3 | SERVICE_PASSWORD = "password" |
3 | SERVICE_TENANT_NAME = "service" | 4 | SERVICE_TENANT_NAME = "service" |
4 | DB_USER = "admin" | 5 | DB_USER = "admin" |
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_2013.1.bb b/meta-openstack/recipes-devtools/python/python-keystone_2013.1.bb index 216bfd2..1c6e804 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_2013.1.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_2013.1.bb | |||
@@ -62,11 +62,11 @@ pkg_postinst_${SRCNAME} () { | |||
62 | sudo -u postgres createdb keystone | 62 | sudo -u postgres createdb keystone |
63 | keystone-manage db_sync | 63 | keystone-manage db_sync |
64 | keystone-manage pki_setup | 64 | keystone-manage pki_setup |
65 | # quick fix | 65 | |
66 | echo "source /etc/keystone/openrc" > /home/root/.bashrc | ||
67 | #Create users, services and endpoints | 66 | #Create users, services and endpoints |
68 | /etc/init.d/keystone start | 67 | /etc/init.d/keystone start |
69 | sleep 0.25 | 68 | sleep 0.25 |
69 | ADMIN_PASSWORD=${ADMIN_PASSWORD} \ | ||
70 | SERVICE_PASSWORD=${SERVICE_PASSWORD} \ | 70 | SERVICE_PASSWORD=${SERVICE_PASSWORD} \ |
71 | SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME} \ | 71 | SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME} \ |
72 | bash /etc/keystone/identity.sh | 72 | bash /etc/keystone/identity.sh |