Commit 4157bf4d authored by Federico Sismondi's avatar Federico Sismondi
Browse files

Working on a Fix for webpack unglifyjs deprecation error, updated some...

Working on a Fix for webpack unglifyjs deprecation error, updated some hardcoded ansible variables so I can run things in irisa.fr servers
parent 92f4eee6
Pipeline #581 canceled with stage
[defaults]
inventory = hosts
remote_user = ubuntu
remote_user = root
ask_sudo_pass= false
ansible_python_interpreter="/usr/bin/env python"
\ No newline at end of file
- hosts: finterop_myslice
roles:
- myslice_rethinkdb
- myslice_sfa_registry
#- myslice_sfa_registry
- myslice_v2_gui
vars_files:
- myslice_vars.yml
......
[finterop_myslice]
132.227.122.143
\ No newline at end of file
vm1-f-interop.rennes.inria.fr
\ No newline at end of file
......@@ -4,10 +4,10 @@
# more specific configuration one can find in defaults/main.cfg
#
# GIT repository for myslice
ms_myslice_git_repo: "git@gitlab.distantaccess.com:f-interop/gui.git"
ms_myslice_git_repo: "https://gitlab.irisa.fr/fedesismo/gui.git"
# GIT repository for myslicelib
ms_myslicelib_git_repo: "git@gitlab.distantaccess.com:f-interop-contributors/myslicelib.git"
ms_myslicelib_git_repo: "https://gitlab.irisa.fr/fedesismo/myslicelib.git"
# What version of the repository to check out. This can be the the literal string HEAD, a branch name, a tag name.
ms_myslicelib_git_repo_version: master
......@@ -18,8 +18,12 @@ ms_private_key_file: "/root/.ssh/id_rsa"
ms_admin_email: 'support@myslice.info'
ms_admin_password: 'superpassword'
ms_conf_web_url : 132.227.122.143 # if you are deploying with openstack this will be ignored
ms_conf_web_domain : 132.227.122.143 # if you are deploying with openstack this will be ignored
#interop-so.irisa.fr
ms_conf_web_url : vm1-f-interop.rennes.inria.fr # if you are deploying with openstack this will be ignored
ms_conf_web_domain : vm1-f-interop.rennes.inria.fr # if you are deploying with openstack this will be ignored
#ms_conf_web_url : 132.227.122.143 # if you are deploying with openstack this will be ignored
#ms_conf_web_domain : 132.227.122.143 # if you are deploying with openstack this will be ignored
#[db] - this is RethinkDB used by my slice and installed by myslice_rethinkdb role
......@@ -38,12 +42,18 @@ ms_conf_email_password: nopass # this will be ignored
ms_conf_email_picture: https://www.iot-lab.info/wp-content/uploads/2014/02/IMG_3320_DxO_cutted-300x200.png
#[finterop] - this part is f-interop specific only
ms_conf_finterop_sessionOrchestratorUrl: http://orchestrator.dev.f-interop.eu
ms_conf_finterop_sessionOrchestratorUrl: http://interop-so.irisa.fr
ms_conf_finterop_sessionOrchestratorPort: 8181
ms_conf_finterop_amqpServerUrl: mq.dev.f-interop.eu
ms_conf_finterop_amqpServerPort: 443
ms_conf_finterop_amqpServerUrl: interop-rmq.irisa.fr
ms_conf_finterop_amqpServerPort: 5672
ms_conf_finterop_AMQP_USER: f-interop
ms_conf_finterop_AMQP_PASS: Cowabunga
#ms_conf_finterop_sessionOrchestratorUrl: http://orchestrator.dev.f-interop.eu
#ms_conf_finterop_sessionOrchestratorPort: 8181
#ms_conf_finterop_amqpServerUrl: mq.dev.f-interop.eu
#ms_conf_finterop_amqpServerPort: 443
#ms_conf_finterop_AMQP_USER: f-interop
#ms_conf_finterop_AMQP_PASS: Cowabunga
# end main config for myslice
#
......
......@@ -17,12 +17,13 @@ sfa_group: 'adm'
# sfa configuration
sfa_git_repository: 'git://git.onelab.eu/sfa.git'
sfa_git_version: 'stable'
sfa_git_version: 'master'
sfa_clone_destination: '/home/sfareg/sfa'
# sfa config file
sfa_interface_hrn: 'finterop'
sfa_registry_host: 'finterop-reg.noc.onelab.eu'
#sfa_registry_host: 'finterop-reg.noc.onelab.eu'
sfa_registry_host: 'interop.irisa.fr'
sfa_root_auth: 'finterop'
sfa_db_host: 'localhost'
......@@ -33,5 +34,5 @@ sfa_admin_email: 'support@myslice.info'
sfa_admin_password: 'set_the_password'
# initialize sfa (only for the first time)
sfa_init_sfa: True
sfa_init_sfa: False
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAtgRzIuO6+GzmQ3tpRpHMbBHxOOfrHPoWs1LMEi6w7NbTUqb+
RF2ut1QE8RfAxQnxyYNnuFqTkckLkNZnW/AuWu0n7wkpKUgzWkQDnR1ZKbLM0AYN
U/1P+OGXXxoo39k2Y4uWILECam4tE3L+25gCmvuIEczG1xU0i5Ybj6Oj2nrDsWBf
as9YKss808ZKvlvISf/3PUJNGWqa9Egtf7IBDA9AIWgjLZmn43ZBHG2ByCRdtNBy
zlUoFk+st0XtKmS7Swc0CG94xaOn/vcGOeVfLqXIY6NEIBuhM2rimqUsh6vHoAgY
RQ9iab/NiNdThLVfRa0JZEOaO4wjPTDfucsDPQIDAQABAoIBAGQUsEYX159vKXEj
c3BVDITDnNJAWvuU21SAiyrYN3oSaSHCJn7qz/2HmiwCdoEhBaxar3Yjf46ib9SU
v0JDHwnp6pI5hENpqqrQSPhjwbn20Tz0hvGOkCF10Sh+lsj2gzxa7RJOodhpeil+
inmt7IjREzFOWmq7AyhZQhBJ1vdyqSQf3hM8S/Wumdpi1SquSZ4ujbR5SzTQ8Fi5
upiMSREt4QbGVdrSTH93cBuziWYnuPCCieR9Tg/1fb5aPFqlL4jgtCTOXPDvhJ1e
xCD/VPVLkQMCy0MXZPyATpgRKvxiQU2heuHti7deY5dT5yWKAfBaPqN0y2NEduFP
UfrSaWECgYEA5zCAY5Z3DCGEN4Y3o0uyxWKZP3/E8Ju+cocqHKOqXwTsJc/ogcCP
kS818Sh/9alt5mX+VtkG1zjfxN1XygkiO82z1OSaYD8g7VPbKXj4RdXEbqAwbdsW
FqxrG21yeXZ+UWojeDIktCfIKVHNYcIWIDDXtLWBuRlta7HAV8x09+kCgYEAyY0J
irkDLE1KAf4T4BQ2s9v0hLmGis1sWpk4RV8uboTjlvpw6c1tm/WWy3j/0ZKnCsoe
L24/GhNTYJaeN44rpHsOx8gByHV8WH8GSIas7yTNf9Ldt8ID9NI5NS64VEWTlG6/
4sPoZxwUcwU4fN1RjSsRdCgJiJYGsINcVOdYMDUCgYBOfGfJ52YJB0Pkubsfw+4w
FpYiOZU5fhY8uWhxipqnYXtuJtQvYJkc1+M/ONmgI+H8ivm6sDkjTdqh8ecA3vLx
TJdVmjpSnHvoNkS8IqZexwDF8bofQXaRQf2mtRRc6f5eU2MxRgyx4KOSa4QHQSXT
zeEdJ1Wf6mL8Yb8Dz5SSKQKBgQCWeNVG3BmiWZGHK0lrYav1W6GR9XCc8ACVIw7/
u6/OkyfW7+KcquHKLfAGuK9Ep1hOldczUfuKXCNDWS+GCn5KrhS60neCUTQkXbEz
NFinsbI6XBNrvU122fwb2GWFhOxJROW9RsWbNTuPI7aoghMAccb2EW4MqvUTkv67
5HvSgQKBgAIv89O6BIhfuYcHACah5sZ1vZs4ZxyZIr417v8I4qscCJWWgbB3QCek
Kspb/Ce2cWBSM1ybA+/RV12Idv4iNh21szpF0mW7aZn7tNtb3u6iPZHoPPMJ7SNE
2NKkRZRdBW9fROQbOyel7iGwLd83jnQhEqJ7FsPaXITNlH9MQg7c
-----END RSA PRIVATE KEY-----
\ No newline at end of file
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD8BME4yI4K97JdG6s6YidALeOceaEUBu03V0L4NE3hQ1Fdq+IHzZR+SNt6j9eraV9UvYipklvhquNHnd0dlrZd8sS0VUNrsZ3op3S5HLGK258ZgsnrHRYhxBVJ7CDsae3UzWvjvPqCx6zY+z7Ly20NlDQatZpAiiMDP6fLNVGxnu1uxHD61KMYbN4mIeOFh5ulPwBhV+jLWaRhV+KFYaTvLiJ6Cm6ce1L4tP91wILapoKydJ6I/5g+9s8H5bagS3SfKEzQPD5YfmkoQT7BektEYCXQM7h3ctTlWwLMmdiT26mWWd4AW51AG1r3GnJw/ap1lA4Sm6kbCCQXpSk59/pZ root@vm1
\ No newline at end of file
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2BHMi47r4bOZDe2lGkcxsEfE45+sc+hazUswSLrDs1tNSpv5EXa63VATxF8DFCfHJg2e4WpORyQuQ1mdb8C5a7SfvCSkpSDNaRAOdHVkpsszQBg1T/U/44ZdfGijf2TZji5YgsQJqbi0Tcv7bmAKa+4gRzMbXFTSLlhuPo6PaesOxYF9qz1gqyzzTxkq+W8hJ//c9Qk0Zapr0SC1/sgEMD0AhaCMtmafjdkEcbYHIJF200HLOVSgWT6y3Re0qZLtLBzQIb3jFo6f+9wY55V8upchjo0QgG6EzauKapSyHq8egCBhFD2Jpv82I11OEtV9FrQlkQ5o7jCM9MN+5ywM9 root@interop
\ No newline at end of file
......@@ -43,6 +43,8 @@
group: "{{ ms_group }}"
become: yes
# update 18/02/2018, this may throw some ansible errors, no f**ing idea why
# just comment out and run command manually in machine
- name: install requirements
pip:
executable: 'pip3'
......
......@@ -63,7 +63,7 @@
"react-test-renderer": "^15.6.2",
"sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"uglifyjs-webpack-plugin": "^0.4.3"
"uglifyjs-webpack-plugin": "^0.4.6"
},
"jest": {
"setupFiles": [
......
......@@ -3,6 +3,8 @@ var devConfig = require('./webpack.config.js');
const merge = require('webpack-merge');
var webpack = require('webpack');
const UglifyJsPlugin = require("uglifyjs-3-webpack-plugin");
const newConfig = {
loaders: {
test: [/\.js$/, /\.es6$/],
......@@ -10,7 +12,8 @@ const newConfig = {
},
devtool: "source-map",
plugins: [
new webpack.optimize.UglifyJsPlugin({
new UglifyJsPlugin({
uglifyOptions: {
sourceMap: false,
mangle: false,
compress: {
......@@ -22,6 +25,7 @@ const newConfig = {
output: {
comments: false,
}
}
})
]
}
......
This diff is collapsed.
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