diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-07 13:51:41 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-08 09:35:33 +0000 |
| commit | 4c4181d54a5fe5491db8e3f4f29a615005d23c64 (patch) | |
| tree | b1a778163e36efa450db07aadb2a201de2c4eb1c /docker | |
| parent | c322be21c1f8df7533212cbdbb98d14c92b0df27 (diff) | |
| download | kolla-4c4181d54a5fe5491db8e3f4f29a615005d23c64.tar.gz kolla-4c4181d54a5fe5491db8e3f4f29a615005d23c64.zip | |
Fix permissions on log directory for keystone
Additionally fixed bootstrap issue caused by an ansible bug in some
versions of the docker module.
Closes-Bug: #1472270
Change-Id: Ia5a370db5ab7690854afcd63492ba7dbbea29835
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/binary/keystone/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/common/keystone/start.sh | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile index 891d01ad8..ae03df97e 100644 --- a/docker/centos/binary/keystone/Dockerfile +++ b/docker/centos/binary/keystone/Dockerfile @@ -14,7 +14,7 @@ RUN sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone. RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin -RUN chown -R keystone: /var/www/cgi-bin/keystone /var/log/keystone +RUN chown -R keystone: /var/www/cgi-bin/keystone RUN chmod 755 /var/www/cgi-bin/keystone/* # Add start-up and check scripts diff --git a/docker/common/keystone/start.sh b/docker/common/keystone/start.sh index 9a184787d..a05be17ae 100755 --- a/docker/common/keystone/start.sh +++ b/docker/common/keystone/start.sh @@ -20,17 +20,18 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then $CMD sleep 5 - openstack service create --name keystone \ - --description "OpenStack Identity" identity - openstack endpoint create --region "${REGION_NAME}" \ + keystone service-create --name keystone --type identity \ + --description "OpenStack Identity" + keystone endpoint-create --region "${REGION_NAME}" \ --publicurl "${PUBLIC_URL}" \ --internalurl "${INTERNAL_URL}" \ - --adminurl "${ADMIN_URL}" identity + --adminurl "${ADMIN_URL}" \ + --service-id $(keystone service-list | awk '/ identity / {print $2}') - openstack project create --description "Admin Project" admin - openstack user create --password "${KEYSTONE_ADMIN_PASSWORD}" admin - openstack role create admin - openstack role add --project admin --user admin admin + keystone tenant-create --description "Admin Project" --name admin + keystone user-create --pass "${KEYSTONE_ADMIN_PASSWORD}" --name admin + keystone role-create --name admin + keystone user-role-add --user admin --tenant admin --role admin exit 0 fi |