Skip to content

C
CONF
Commit 4c59918f authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

Updated EGI os_template. Has changed and would not provision

parent 90bf7ea8
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 167 deletions
Dockerfiles/deployer/Dockerfile
View file @ 4c59918f
# Pull base image # Pull base image
FROM ubuntu:latest FROM ubuntu:latest
##install java
ARG RABBITMQ_HOST=127.0.0.1
ARG MONOG_HOST=127.0.0.1
ARG RELESE_VERSION=0.1
ARG CERTS=/etc/grid-security/certificates
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
RUN apt-get upgrade -y RUN apt-get upgrade -y
RUN apt-get install -y wget software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-dev python-pip RUN apt-get install -y wget software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-pip
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install pydot RUN pip install pydot
...@@ -21,7 +27,7 @@ RUN pip install paramiko ...@@ -21,7 +27,7 @@ RUN pip install paramiko
WORKDIR /root/ WORKDIR /root/
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-deployer.tar.gz RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/$RELESE_VERSION/drip-deployer.tar.gz
RUN tar -xzvf drip-deployer.tar.gz RUN tar -xzvf drip-deployer.tar.gz
WORKDIR drip-deployer WORKDIR drip-deployer
......
Dockerfiles/docker-compose.yml
View file @ 4c59918f
...@@ -2,23 +2,27 @@ version: '2' ...@@ -2,23 +2,27 @@ version: '2'
services: services:
mongo: mongo:
image: mongo:3 image: mongo:3
ports: ports:
- "27017:27017" - "27017:27017"
command: "mongod --port 27017" command: "mongod --port 27017"
restart: always restart: always
rabbit: rabbit:
image: rabbitmq:latest image: rabbitmq:3-management
ports: ports:
- "5671-5672:5671-5672" - "5671-5672:5671-5672"
- "15671:15671" - "15671:15671"
restart: always restart: always
drip-planner: drip-planner:
depends_on: depends_on:
- rabbit - rabbit
build: planner/Dockerfile build:
context: ./planner
dockerfile: Dockerfile
environment:
- RELESE_VERSION=0.3
image: drip-planner:latest image: drip-planner:latest
restart: always restart: always
environment: environment:
......
Dockerfiles/manager/Dockerfile
View file @ 4c59918f
...@@ -2,31 +2,42 @@ FROM ubuntu:latest ...@@ -2,31 +2,42 @@ FROM ubuntu:latest
MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl" MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl"
ARG RABBITMQ_HOST=127.0.0.1
ARG MONOG_HOST=127.0.0.1
ARG RELESE_VERSION=0.1
ARG CERTS=/etc/grid-security/certificates
##install java ##install java
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openjdk-8-jdk RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
RUN apt-get upgrade -y RUN apt-get upgrade -y
RUN apt-get install -y wget git RUN apt-get install -y wget git software-properties-common build-essential libssl-dev libffi-dev myproxy
RUN apt-get install -y python-software-properties debconf-utils apt-utils
RUN add-apt-repository -y ppa:webupd8team/java
RUN apt-get update
RUN "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
RUN apt-get install -y oracle-java8-installer
##install drip-manager ##install drip-manager
WORKDIR /root WORKDIR /root
RUN wget http://www-eu.apache.org/dist/tomcat/tomcat-7/v7.0.75/bin/apache-tomcat-7.0.75.tar.gz # RUN wget http://www-eu.apache.org/dist/tomcat/tomcat-7/v7.0.75/bin/apache-tomcat-7.0.75.tar.gz
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/0.1/apache-tomcat-7.0.75.tar.gz
RUN tar -xzf apache-tomcat-7.0.75.tar.gz RUN tar -xzf apache-tomcat-7.0.75.tar.gz
WORKDIR apache-tomcat-7.0.75 WORKDIR apache-tomcat-7.0.75
RUN echo RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/$RELESE_VERSION/drip-api-1.0-SNAPSHOT.tar.gz
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-api-1.0-SNAPSHOT.tar.gz
RUN tar -xzvf drip-api-1.0-SNAPSHOT.tar.gz RUN tar -xzvf drip-api-1.0-SNAPSHOT.tar.gz
ARG RABBITMQ_HOST=172.17.0.2
ARG MONOG_HOST=172.17.0.3
RUN sed -ie "s/^message.broker.host=.*/message.broker.host=$RABBITMQ_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties RUN sed -ie "s/^message.broker.host=.*/message.broker.host=$RABBITMQ_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
RUN sed -ie "s/^db.host=.*/db.host=$MONOG_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties RUN sed -ie "s/^db.host=.*/db.host=$MONOG_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
RUN cat drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties RUN cat drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
RUN mv drip-api-1.0-SNAPSHOT webapps/drip-api RUN mv drip-api-1.0-SNAPSHOT webapps/drip-api
WORKDIR /root WORKDIR /root
RUN echo "./apache-tomcat-7.0.75/bin/startup.sh" >> startAll.sh RUN echo "/root/apache-tomcat-7.0.75/bin/startup.sh" >> startAll.sh
RUN echo "tail -f ./apache-tomcat-7.0.75/logs/catalina.out" >> startAll.sh RUN echo "tail -f ./apache-tomcat-7.0.75/logs/catalina.out" >> startAll.sh
RUN echo "while true" >> startAll.sh RUN echo "while true" >> startAll.sh
RUN echo "do" >> startAll.sh RUN echo "do" >> startAll.sh
......
Dockerfiles/planner/Dockerfile
View file @ 4c59918f
...@@ -4,12 +4,12 @@ FROM ubuntu:latest ...@@ -4,12 +4,12 @@ FROM ubuntu:latest
MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl" MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl"
##install java
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
RUN apt-get upgrade -y RUN apt-get upgrade -y
RUN apt-get install -y wget software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-dev python-pip RUN apt-get install -y wget git inetutils-ping software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-pip
# Install python stuff
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install pydot RUN pip install pydot
RUN pip install numpy RUN pip install numpy
...@@ -22,17 +22,12 @@ RUN pip install paramiko ...@@ -22,17 +22,12 @@ RUN pip install paramiko
# Install deployer
WORKDIR /root/ WORKDIR /root/
COPY ../../drip-planner . RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/$RELESE_VERSION/drip-deployer.tar.gz
RUN ls RUN tar -xzvf drip-deployer.tar.gz
# RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-planner.tar.gz
# RUN tar -xzvf drip-planner.tar.gz ENTRYPOINT python /root/drip-planner/rpc_server.py $RABBITMQ_HOST
# WORKDIR drip-planner
# ARG RABBITMQ_HOST=172.17.0.2
# RUN echo $RABBITMQ_HOST > hostFile
ENTRYPOINT python rpc_server.py $RABBITMQ_HOST
# docker build -t drip-planner . # docker build -t drip-planner .
# docker run --name drip-planner-inst -d drip-planner # docker run --name drip-planner-inst -d drip-planner
Dockerfiles/provisioner/Dockerfile
View file @ 4c59918f
...@@ -3,33 +3,46 @@ FROM ubuntu:latest ...@@ -3,33 +3,46 @@ FROM ubuntu:latest
MAINTAINER Huan "h.zhou@uva.nl" MAINTAINER Huan "h.zhou@uva.nl"
ARG release_version=0.0.3
ARG RABBITMQ_HOST=127.0.0.1
ARG MONOG_HOST=127.0.0.1
ARG RELESE_VERSION=0.1
ARG CERTS=/etc/grid-security/certificates
WORKDIR /root/ WORKDIR /root/
#install openssh and wget #install openssh and wget
RUN apt-get update && apt-get upgrade -y ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
RUN apt-get install openssh-server wget software-properties-common inetutils-ping -y RUN apt-get upgrade -y
RUN apt-get install -y openssh-server wget git inetutils-ping software-properties-common build-essential libssl-dev libffi-dev graphviz graphviz-dev python-pip
##install jdk 1.8 ##install java
ENV DEBIAN_FRONTEND=noninteractive RUN apt-get install -y python-software-properties debconf-utils apt-utils
RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
RUN add-apt-repository -y ppa:webupd8team/java RUN add-apt-repository -y ppa:webupd8team/java
RUN apt-get update RUN apt-get update
RUN apt-get install -y oracle-java8-set-default RUN "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
RUN apt-get install -y oracle-java8-installer
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar
ARG RABBITMQ_HOST=172.17.0.1 #Install provisioner
WORKDIR /root WORKDIR /root/
RUN echo rabbitmq.host=$RABBITMQ_HOST > provisioner.properties RUN mkdir /root/drip-provisioner/
RUN cat provisioner.properties WORKDIR /root/drip-provisioner/
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/database.tar.gz RUN wget https://raw.githubusercontent.com/EGI-FCTF/fedcloud-userinterface/master/fedcloud-ui.sh
RUN chmod +x fedcloud-ui.sh
RUN ./fedcloud-ui.sh
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/$RELESE_VERSION/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar
RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/$RELESE_VERSION/database.tar.gz
RUN tar -xzvf database.tar.gz RUN tar -xzvf database.tar.gz
RUN echo rabbitmq.host=$RABBITMQ_HOST >> provisioner.properties
RUN echo trusted.certificates.folder=$CERTS >> provisioner.properties
RUN echo domain.info.path=/root/drip-provisioner >> provisioner.properties
RUN cat provisioner.properties
ENTRYPOINT java -jar drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar /root/provisioner.properties ENTRYPOINT java -jar /root/drip-provisioner/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar /root/drip-provisioner/provisioner.properties
#Build: docker build -t drip-pro . #Build: docker build -t drip-pro .
# Run: docker run --name drip-pro-inst -d drip-pro # Run: docker run --name drip-pro-inst -d drip-pro
docs/playbooks/euroArgo_conf_playbook_partition.yml 0 → 100644
View file @ 4c59918f
---
- hosts: all
tasks:
- name: install pre-req
apt: name="{{ item }}" update_cache=yes state=latest
with_items: [python, tcsh, expect, jq , bc, python-pip, python-dev, build-essential, libgeos-dev, nmap]
become: true
- {name: pip, pip: name=pyproj}
- {name: pip, pip: name=shapely}
- {name: pip, pip: name=psutil}
- {name: mkdir, command: mkfs.ext4 /dev/vdc, become: yes}
- {name: create mount point, file: path=/mnt/data/ state=directory owner=vm_user group=vm_user}
- {name: create mount point, file: path=/mnt/data/source/ state=directory owner=vm_user group=vm_user}
- {name: create mount point, file: path=/mnt/data/source/output state=directory owner=vm_user group=vm_user}
- {name: mount, command: mount /dev/vdc /mnt/data, become: yes}
- {name: download dataset, get_url: 'url=ftp://ftp.ifremer.fr/ifremer/coriolis/co0547-bigdata-archive/envriplus_euroargo_bigdata.tar.gz dest=/mnt/data'}
- {name: untar, unarchive: src=/mnt/data/envriplus_euroargo_bigdata.tar.gz dest=/mnt/data/}
- {name: download partitioning script, get_url: 'url=https://raw.githubusercontent.com/skoulouzis/dockerfiles/master/ArgoDiffusion/scripts/partitioning.py dest=/mnt/data/source/'}
- {name: download getDelta for time_cover, get_url: 'url=https://raw.githubusercontent.com/skoulouzis/dockerfiles/master/ArgoDiffusion/scripts/getDelta.py dest=/mnt/data/source/'}
- {name: download ar_bigmetadata for the filter script, get_url: 'url=https://raw.githubusercontent.com/skoulouzis/dockerfiles/master/ArgoDiffusion/scripts/ar_bigmetadata.json dest=/mnt/data/source/'}
- {name: download for filter script, get_url: 'url=https://raw.githubusercontent.com/skoulouzis/dockerfiles/master/ArgoDiffusion/scripts/configuration.json dest=/mnt/data/source/'}
- {name: exec partitioning, command: python /mnt/data/source/partitioning.py /mnt/data/source/configuration.json, become_user: vm_user}
- {name: create data_argo.txt, file: path=//mnt/data/data_argo.txt state=touch owner=vm_user group=vm_user}
\ No newline at end of file
drip-api/src/main/webapp/app.js 0 → 100644
View file @ 4c59918f
var app = angular.module('flapperNews', []);
app.controller('MainCtrl', [
'$scope',
function ($scope) {
$scope.test = 'Hello world!';
}]);
drip-api/src/main/webapp/index.html 0 → 100644
View file @ 4c59918f
<html>
<head>
<title>My Angular App!</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
<script src="app.js"></script>
</head>
<body ng-app="flapperNews" ng-controller="MainCtrl">
<div>
{{test}}
</div>
</body>
</html>
\ No newline at end of file
drip-api/src/main/webapp/index.jsp deleted 100644 → 0
View file @ 90bf7ea8
<body>
<div class="container">
<h1>This is secured!</h1>
<p>
Hello <b><c:out value="${pageContext.request.remoteUser}"/></b>
</p>
<c:url var="logoutUrl" value="/logout"/>
<form class="form-inline" action="${logoutUrl}" method="post">
<input type="submit" value="Log out" />
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
</form>
</div>
</body>
drip-api/src/main/webapp/uploadfile.jsp
View file @ 4c59918f
<%@taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
<html> <html>
<head>
<title>Crunchify - Spring MVC Upload Multiple Files Example</title>
<script
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script>
$(document)
.ready(
function () {
//add more file components if Add is clicked
$('#addFile')
.click(
function () {
var fileIndex = $('#fileTable tr')
.children().length - 1;
$('#fileTable')
.append(
'<tr><td>'
+ ' <input type="file" name="files[' + fileIndex + ']" />'
+ '</td></tr>');
});
});
</script>
<style type="text/css">
body {
background-image:
url('https://cdn.crunchify.com/wp-content/uploads/2013/03/Crunchify.bg_.300.png');
}
</style>
</head>
<body>
<br>
<br>
<div align="center">
<h1>Crunchify - Spring MVC Upload Multiple Files Example</h1>
<form:form method="post" action="savefiles.html"
modelAttribute="uploadForm" enctype="multipart/form-data">
<p>Select files to upload. Press Add button to add more file
inputs.</p>
<table id="fileTable">
<tr>
<td><input name="files[0]" type="file" /></td>
</tr>
<tr>
<td><input name="files[1]" type="file" /></td>
</tr>
</table>
<br />
<input type="submit" value="Upload" />
<input id="addFile" type="button" value="Add File" />
</form:form>
<br />
</div>
</body>
</html> </html>
\ No newline at end of file
drip-api/src/main/webapp/uploadfilesuccess.jsp
View file @ 4c59918f
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html> <html>
<head>
<title>Crunchify - Upload Multiple Files Example</title>
<style type="text/css">
body {
background-image:
url('https://cdn.crunchify.com/wp-content/uploads/2013/03/Crunchify.bg_.300.png');
}
</style>
</head>
<body>
<br>
<br>
<div align="center">
<h1>Crunchify - Spring MVC Upload Multiple Files Example</h1>
<p>Awesome.. Following files are uploaded successfully.</p>
<ol>
<c:forEach items="${files}" var="file">
- ${file} <br>
</c:forEach>
</ol>
<a href="http://localhost:8080/CrunchifySpringMVC3.2.1/upload.html"><input
type="button" value="Go Back" /></a> <br />
<br />
<br />
<div
style="font-family: verdana; line-height: 25px; padding: 5px 10px; border-radius: 10px; border: 1px dotted #A4A4A4; width: 50%; font-size: 12px;">
Spring MVC Upload Multiple Files Example by <a
href='https://crunchify.com'>Crunchify</a>. Click <a
href='https://crunchify.com/category/java-web-development-tutorial/'>here</a>
for all Java, Spring MVC, Web Development examples.<br>
</div>
</div>
</body>
</html> </html>
\ No newline at end of file
drip-provisioner/etc/EGI_Domain_Info
View file @ 4c59918f
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&medium&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#medium&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_egi_ubuntu_server_14_04_lts_fedcloud_warg_131&&ubuntu CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&medium&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#medium&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&extra_large&&http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large&& http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_egi_ubuntu_server_14_04_lts_fedcloud_warg_131&&ubuntu CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&extra_large&&http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218&&ubuntu
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment