diff --git a/roles/jenkins b/roles/jenkins index a288115..1b00ced 160000 --- a/roles/jenkins +++ b/roles/jenkins @@ -1 +1 @@ -Subproject commit a28811530bb5a56477553f785467ea4420ad1011 +Subproject commit 1b00ced90519023b05d56f72f8ac9bac6ea5d324 diff --git a/roles/nfs b/roles/nfs index 04a072f..d25407f 160000 --- a/roles/nfs +++ b/roles/nfs @@ -1 +1 @@ -Subproject commit 04a072f088f812244688ca4cf056ff7cac0667a9 +Subproject commit d25407f994b9693a20a32cd705fd7c0d630c19c3 diff --git a/vars/main.yml.example b/vars/main.yml.example index a3351a6..24db87c 100644 --- a/vars/main.yml.example +++ b/vars/main.yml.example @@ -1,64 +1,64 @@ --- project_name: "c4science" ansible_ssh_user: "centos" # OpenStack keypair_name: "" image_id: "" public_net: "" private_net: "" flavor_id_small: "" flavor_id_medium: "" flavor_id_large: "" flavor_id_small_backup: "" private_net_backup: "" image_id_backup: "" region_main: "" region_back: "" # Storage s3_access_key: "" s3_secret_key: "" s3_endpoint: "" s3_bucket: "" # Lbs external_ip: 0.0.0.0 backup_ip: 0.0.0.0 jenkins_port: 8080 stats_port: 8082 monit_port: 8081 monit_user: admin monit_pass: # App domain: example.com phabricator_path: /srv/www/facebook/phabricator/ repositories_path: /var/repo/ phd_user: phabricator www_user: apache vcs_user: git vcs_port: 2222 # NFS nfs_exports: { "/var/repo 10.0.0.0/16(rw,sync,no_root_squash,no_subtree_check)" } # Dbs -mysql_user: "" -mysql_pass: "" +mysql_app_user: "" +mysql_app_pass: "" mysql_cluster_name: "" # SSH ssh_keys: - "ssh-rsa mysuperkey1" - "ssh-rsa mysuperkey2" # Swap swap_path: "/swapfile" dd_bs_size_mb: 32 swap_count: 128 swappiness: 10 vfs_cache_pressure: 50