If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. If you are using the VPN, then SSH will work normally.

Commit 0b1ec3a9 authored by Eric Pellegrini's avatar Eric Pellegrini

updated in5 prototype for a single machine

parent ed0da48f
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
os_admin_auth: os_admin_auth:
auth_url: http://oscloud.ill.fr:5000/v3 auth_url: http://oscloud.ill.fr:5000/v3
username: visa-admin username: visa-admin
password: nesh6EiG password: "{{ vault_os_admin_password }}"
project_name: "VISA Development" project_name: "VISA Development"
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
project_id: ba1076db7c4e4cd89b3230ac0c131862 project_id: ba1076db7c4e4cd89b3230ac0c131862
os_flavors: os_flavors:
- name: jupyterhub - name: jupyterhub-large
auth: "{{ os_admin_auth }}" auth: "{{ os_admin_auth }}"
auth_type: password auth_type: password
ram: 131072 ram: 131072
...@@ -39,7 +39,7 @@ os_keypairs: ...@@ -39,7 +39,7 @@ os_keypairs:
os_vms_commons: os_vms_commons:
keypair: "{{ os_keypairs[1]['name'] }}" keypair: "{{ os_keypairs[1]['name'] }}"
network: visa_dev network: "visa_dev"
availability_zone: nova availability_zone: nova
security_groups: ["default","in5-secgrp"] security_groups: ["default","in5-secgrp"]
auth: "{{ os_admin_auth }}" auth: "{{ os_admin_auth }}"
...@@ -53,13 +53,9 @@ os_vms_commons: ...@@ -53,13 +53,9 @@ os_vms_commons:
vm_admin: ubuntu vm_admin: ubuntu
os_vms: os_vms:
- name: jhub-srv-1 - name: jhub-srv
inventory_groups: inventory_groups:
- jhub_servers - jhub_servers
- cluster
- name: jhub-haproxy
inventory_groups:
- mysql_server - mysql_server
- haproxy_server - haproxy_server
- cluster - cluster
...@@ -123,10 +119,6 @@ ntp: ...@@ -123,10 +119,6 @@ ntp:
############################################# #############################################
mysql: mysql:
localhost: False
bind_server: jhub-haproxy
databases: databases:
- jupyterhub_db - jupyterhub_db
...@@ -134,16 +126,16 @@ mysql: ...@@ -134,16 +126,16 @@ mysql:
- name: jupyterhub_db_user - name: jupyterhub_db_user
password: "{{ vault_mysql_user }}" password: "{{ vault_mysql_user }}"
priv: "jupyterhub_db.*:ALL" priv: "jupyterhub_db.*:ALL"
host: "192.168.14.%" host: "localhost"
############################################# #############################################
# load_balancer # load_balancer
############################################# #############################################
load_balancer: load_balancer:
proxy_server: jhub-haproxy proxy_server: jupyterhub-dev.ill.fr
pem_file: /etc/ssl/certs/jupyterhub-dev.ill.fr.pem pem_file: /etc/ssl/certs/star.ill.fr-eu.pem
############################################# #############################################
# ssd # ssd
...@@ -182,7 +174,6 @@ jupyterhub: ...@@ -182,7 +174,6 @@ jupyterhub:
port: 8080 port: 8080
mysql: mysql:
bind_server: "{{ mysql['bind_server'] }}"
database: "{{ mysql['databases'][0] }}" database: "{{ mysql['databases'][0] }}"
user: "{{ mysql['users'][0]['name'] }}" user: "{{ mysql['users'][0]['name'] }}"
password: "{{ mysql['users'][0]['password'] }}" password: "{{ mysql['users'][0]['password'] }}"
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