Make keystone more generic

roles/keystone/files/Dockerfile

@@ -5,23 +5,11 @@
 # $ docker run hpc/keystone --add-host=mariadb:<ip mariadb> "keystone-manage db_sync"
 
 # wellicht ubuntu 16.04 of anders 18.04
-FROM ubuntu:16.04
-
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
+FROM ubuntu:zesty
 
 RUN apt-get update
 
-RUN set -x \
-    && echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" > /etc/apt/sources.list.d/ocata.list \
-    && apt-get -y update \
-    && apt-get -y install ubuntu-cloud-keyring \
-    && apt-get -y update \
-    && apt-get -y install \
-        mysql-client \
-        python-mysqldb \
-        python-openstackclient \
-        keystone \
-    && apt-get -y clean
+RUN apt-get install --yes keystone python-openstackclient
 
 # set admin token TODO: make this a secret
 # in volume of met env
@@ -31,9 +19,6 @@ RUN mkdir /etc/keystone/fernet-keys
 
 RUN chown keystone: /etc/keystone/fernet-keys
 
-# TODO: move this somewhere else
-ADD admin-openrc.sh /root/admin-openrc.sh
-
 #RUN keystone-manage db_sync
 CMD apachectl -DFOREGROUND