review moonv4

Change-Id: Iaadd2d24871ebca3e8ba741ae21d2c0dc2d6879a
Signed-off-by: WuKong <rebirthmonkey@gmail.com>

3 files changed, 0 insertions, 223 deletions

diff --git a/moonv4/templates/docker/keystone/Dockerfile b/moonv4/templates/docker/keystone/Dockerfile
deleted file mode 100644
index 1ab24de9..00000000
--- a/moonv4/templates/docker/keystone/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM ubuntu:latest
-
-ENV ADMIN_TOKEN=p4ssw0rd
-ENV ADMIN_PASSWORD=p4ssw0rd
-ENV DB_CONNECTION="mysql+pymysql"
-ENV DB_DRIVER=sql
-ENV DB_HOST=localhost
-ENV DB_DATABASE=keystonedb
-ENV DB_USER=keystone
-ENV DB_PASSWORD=p4ssw0rd
-ENV DB_USER_ROOT=root
-ENV DB_PASSWORD_ROOT=p4sswOrd1
-ENV RABBIT_NODE=server
-ENV INTERFACE_HOST="http://localhost:3001"
-
-RUN apt-get update && apt-get install apache2 rabbitmq-server keystone python-openstackclient libapache2-mod-wsgi mysql-client -y
-
-RUN apt-get update && apt-get install iputils-ping net-tools -y
-
-ADD run.sh /root
-
-EXPOSE 35357
-EXPOSE 5000
-
-CMD ["/bin/bash", "/root/run.sh"]
\ No newline at end of file
diff --git a/moonv4/templates/docker/keystone/README.md b/moonv4/templates/docker/keystone/README.md
deleted file mode 100644
index 34926b91..00000000
--- a/moonv4/templates/docker/keystone/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Keystone container
-
-## build keystone image
-
-### without proxy: 
-```bash
-docker build -t keystone:mitaka .
-```
-
-### with a proxy:
-```bash
-docker build --build-arg https_proxy=http://proxy:3128 --build-arg http_proxy=http://proxy:3128 -t keystone:mitaka .
-```
-
-
-## set up an execution environment
-
-### clean up if necessary
-```bash
-docker container rm -f $(docker ps -a | grep moon | cut -d " " -f 1) 2>/dev/null
-docker container rm -f messenger db keystone 2>/dev/null
-```
- 
-### create a network
-```bash
-docker network create -d bridge --subnet=172.18.0.0/16 --gateway=172.18.0.1 moon
-```
-
-### Start RabbitMQ
-```bash
-docker container run -dti --net=moon --hostname messenger --name messenger -e RABBITMQ_DEFAULT_USER=moon -e RABBITMQ_DEFAULT_PASS=p4sswOrd1 -e RABBITMQ_NODENAME=rabbit@messenger -e RABBITMQ_DEFAULT_VHOST=moon -e RABBITMQ_HIPE_COMPILE=1 -p 5671:5671 -p 5672:5672 -p 8080:15672 rabbitmq:3-management
-```
-
-
-### Start MySQL server
-```bash
-docker container run -dti --net=moon --hostname db --name db -e MYSQL_ROOT_PASSWORD=p4sswOrd1 -e MYSQL_DATABASE=moon -e MYSQL_USER=moon -e MYSQL_PASSWORD=p4sswOrd1 -p 3306:3306 mysql:latest
-```
-
-## launch a Keystone container
-```bash
-docker container run -dti --net moon --hostname keystone  --name keystone  -e DB_HOST=db -e DB_PASSWORD_ROOT=p4sswOrd1 -p 35357:35357 -p 5000:5000 keystone:mitaka
-```
-
-## check
-### log
-```bash
-docker logs keystone
-```
-
-
-### access to the container
-```bash
-docker container exec -ti keystone /bin/bash
-export OS_USERNAME=admin
-export OS_PASSWORD=p4ssw0rd
-export OS_REGION_NAME=Orange
-export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://localhost:5000/v3
-export OS_DOMAIN_NAME=Default
-openstack project list
-```
diff --git a/moonv4/templates/docker/keystone/run.sh b/moonv4/templates/docker/keystone/run.sh
deleted file mode 100644
index b80dd3f1..00000000
--- a/moonv4/templates/docker/keystone/run.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env bash
-
-MY_HOSTNAME=localhost
-
-echo DB_HOST=$DB_HOST
-echo DB_DATABASE=$DB_DATABASE
-echo RABBIT_NODE=$RABBIT_NODE
-echo RABBIT_NODE=$[RABBIT_NODE]
-echo INTERFACE_HOST=$INTERFACE_HOST
-
-sed "s/#admin_token = <None>/admin_token=$ADMIN_TOKEN/g" -i /etc/keystone/keystone.conf
-sed "s/connection = sqlite:\/\/\/\/var\/lib\/keystone\/keystone.db/connection = $DB_CONNECTION:\/\/$DB_USER:$DB_PASSWORD@$DB_HOST\/$DB_DATABASE/g" -i /etc/keystone/keystone.conf
-sed "s/#driver = sql/driver = $DB_DRIVER/g" -i /etc/keystone/keystone.conf
-
-cat << EOF | tee -a /etc/keystone/keystone.conf
-[cors]
-allowed_origin = $INTERFACE_HOST
-max_age = 3600
-allow_methods = POST,DELETE
-EOF
-
-mysql -h $DB_HOST -u$DB_USER_ROOT -p$DB_PASSWORD_ROOT <<EOF
-CREATE DATABASE $DB_DATABASE DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
-GRANT ALL ON $DB_DATABASE.* TO '$DB_USER'@'%' IDENTIFIED BY '$DB_PASSWORD';
-GRANT ALL ON $DB_DATABASE.* TO '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASSWORD';
-EOF
-
-#rabbitmqctl -n rabbit@$RABBIT_NODE add_user openstack password
-#rabbitmqctl -n rabbit@$RABBIT_NODE set_permissions openstack ".*" ".*" ".*"
-
-cat << EOF | tee /etc/apache2/sites-available/wsgi-keystone.conf
-Listen 5000
-Listen 35357
-
-<VirtualHost *:5000>
-    WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
-    WSGIProcessGroup keystone-public
-    WSGIScriptAlias / /usr/bin/keystone-wsgi-public
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
-
-    <Directory /usr/bin>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
-
-<VirtualHost *:35357>
-    WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
-    WSGIProcessGroup keystone-admin
-    WSGIScriptAlias / /usr/bin/keystone-wsgi-admin
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
-
-    <Directory /usr/bin>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
-
-EOF
-
-a2ensite wsgi-keystone
-
-service keystone stop
-echo "manual" | tee /etc/init/keystone.override
-
-service apache2 restart
-
-netstat -tanpeo
-
-export http_proxy=
-export https_proxy=
-
-keystone-manage db_sync
-
-keystone-manage bootstrap \
-    --bootstrap-password ${ADMIN_PASSWORD} \
-    --bootstrap-username admin \
-    --bootstrap-project-name admin \
-    --bootstrap-role-name admin \
-    --bootstrap-service-name keystone \
-    --bootstrap-region-id Orange \
-    --bootstrap-admin-url http://localhost:35357 \
-    --bootstrap-public-url http://localhost:5000 \
-    --bootstrap-internal-url http://localhost:5000
-
-
-export OS_USERNAME=admin
-export OS_PASSWORD=${ADMIN_PASSWORD}
-export OS_REGION_NAME=Orange
-export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://localhost:5000/v3
-export OS_DOMAIN_NAME=Default
-
-openstack project create --description "Service Project" demo
-openstack role create user
-openstack role add --project demo --user demo user
-
-echo -e "\n Project list:"
-openstack project list
-
-echo -e "\n Users list:"
-openstack user list
-
-echo -e "\n Roles list:"
-openstack role list
-
-echo -e "\n Service list:"
-openstack service list
-
-echo -e "\n Endpoint list:"
-openstack endpoint list --long
-
-
-tail -f /var/log/apache2/keystone.log
\ No newline at end of file