From ab8bf23d8b6649d93d41888eed52ca1b04c22639 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Sat, 5 Dec 2015 21:48:50 -0800 Subject: [PATCH 1/3] name swarm container, add consul to mavis --- ansible/group_vars/alpha-mavis.yml | 4 +++ ansible/group_vars/alpha-swarm-deamon.yml | 1 + ansible/mavis.yml | 2 ++ .../docker_client/files/certs/mavis/cert.pem | 21 +++++++++++++++ .../docker_client/files/certs/mavis/key.pem | 27 +++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 ansible/roles/docker_client/files/certs/mavis/cert.pem create mode 100644 ansible/roles/docker_client/files/certs/mavis/key.pem diff --git a/ansible/group_vars/alpha-mavis.yml b/ansible/group_vars/alpha-mavis.yml index 7624f571..843dc3f2 100644 --- a/ansible/group_vars/alpha-mavis.yml +++ b/ansible/group_vars/alpha-mavis.yml @@ -24,9 +24,13 @@ container_envs: > -e RABBITMQ_PASSWORD={{ rabbit_password }} -e RABBITMQ_PORT={{ rabbit_port }} -e RABBITMQ_USERNAME={{ rabbit_username }} + -e CONSUL_HOST={{ consul_host_address }} + -e CONSUL_PORT={{ consul_api_port }} + -e DOCKER_CERT_PATH=/etc/ssl/docker container_run_opts: > -h {{ name }} -d -P + -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro {{container_envs}} diff --git a/ansible/group_vars/alpha-swarm-deamon.yml b/ansible/group_vars/alpha-swarm-deamon.yml index 45a79416..b2d16ddd 100644 --- a/ansible/group_vars/alpha-swarm-deamon.yml +++ b/ansible/group_vars/alpha-swarm-deamon.yml @@ -8,6 +8,7 @@ container_tag: 1.0.0 log_driver: json-file container_run_opts: > + --name swarm -d container_run_args: > diff --git a/ansible/mavis.yml b/ansible/mavis.yml index 4b3ad09b..f1943ec9 100644 --- a/ansible/mavis.yml +++ b/ansible/mavis.yml @@ -1,5 +1,6 @@ --- - hosts: redis +- hosts: consul - hosts: rabbitmq - hosts: mavis @@ -8,5 +9,6 @@ roles: - { role: notify, tags: "notify" } - { role: redis_key, tags: ["setup", "redis_key"] } + - { role: docker_client } - { role: builder, tags: "build" } - { role: container_start, tags: "deploy" } diff --git a/ansible/roles/docker_client/files/certs/mavis/cert.pem b/ansible/roles/docker_client/files/certs/mavis/cert.pem new file mode 100644 index 00000000..4634c6b4 --- /dev/null +++ b/ansible/roles/docker_client/files/certs/mavis/cert.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDaDCCAlCgAwIBAgIJALSmsYYWe2lHMA0GCSqGSIb3DQEBCwUAMIGQMQswCQYD +VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j +aXNjbzERMA8GA1UEChMIUnVubmFibGUxDDAKBgNVBAsTA09wczESMBAGA1UEAxMJ +bG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBvcHNAcnVubmFibGUuY29tMB4XDTE1 +MTAxMzE5MjEzNVoXDTE2MTAxMjE5MjEzNVowETEPMA0GA1UEAxMGY2xpZW50MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Q+9XmQj8hgPzt4SWTFE5Bg8 +luxX15L3GdGrd4u8wyq49yuAQcHETp2uQzHtKrYXhRDqR2CNrBERMXUndHZLSDnU +91GWaYl9sfFHJm1q/GC+kAdvKReaOR80a+zZjponDU02lgji6Km9CD/f92wDF0HO +A4usSB1V7n06sBYE+VY0kyZDIfra07WnSG6FnQgsY38q7+UaNEy5NbA4jwo4VsWc +vl9prBAsi8GwRpIu6b1E+0puHauRSz48N0Xe8el4Vms1jV2agdCWD39Xif+1BvSt +DqEg09PgO4QKkDYpF/WAfc1+esekGC0OWRsdadR5fiJrb60aKI+pYIXky0ZxNwID +AQABo0MwQTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIAYDVR0RBBkw +F4cEChQBO4cEfwAAAYIJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQA3yexj +BTKok47lq87ALPOMdbaTUXnzrFhalEZJAKLdiglh42EWIjS+rXkKaqUIh1iB9i/s +4AFqGLqJUh89LR8X27bYc2fpJxCsyVv/uQzGSD2MKsCpyVWuOmj1ro8jhqNzp+5R +CcK7Zht85a+PKGeIy5DGleFQYoVDvW1J9niMpbG0LdEIavJq1oibMZo0VfZtwBkD +BnMJsoDbBWiykPYvPEOnMTOB6k1CsxT2GU2hNhQV7YGrlk0QUCk4CbwRwScCFfy3 +QrqE7fpAjTmpVXqvmSke/hjKknvbfzXt92tGH85PxbUasmnqlSjYkqJxj/NaAJ50 +SSxD6qKqFNjF4Pdh +-----END CERTIFICATE----- diff --git a/ansible/roles/docker_client/files/certs/mavis/key.pem b/ansible/roles/docker_client/files/certs/mavis/key.pem new file mode 100644 index 00000000..64c9307b --- /dev/null +++ b/ansible/roles/docker_client/files/certs/mavis/key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEA6Q+9XmQj8hgPzt4SWTFE5Bg8luxX15L3GdGrd4u8wyq49yuA +QcHETp2uQzHtKrYXhRDqR2CNrBERMXUndHZLSDnU91GWaYl9sfFHJm1q/GC+kAdv +KReaOR80a+zZjponDU02lgji6Km9CD/f92wDF0HOA4usSB1V7n06sBYE+VY0kyZD +Ifra07WnSG6FnQgsY38q7+UaNEy5NbA4jwo4VsWcvl9prBAsi8GwRpIu6b1E+0pu +HauRSz48N0Xe8el4Vms1jV2agdCWD39Xif+1BvStDqEg09PgO4QKkDYpF/WAfc1+ +esekGC0OWRsdadR5fiJrb60aKI+pYIXky0ZxNwIDAQABAoIBAQDBkB747DamdLF8 +YBfhF/hdcHux5Sy3kAnF2cuNB/OILE1eizSEaIe/u1nl2Ote08kI7RmGmnxPcgVT +jDdulGjF3bIwjgRcNqK8TOWI1stKPJdIS8RY3o9p7a6+DAJMW18fvwcc6Nh7361t +0o8SkRSoFjEh5Lj7U9HwtvUtFbyfzxEj6gtGKmQ0FJMVZhQ8CSsewJsoPYvm7n6F +1V3UF/2cH989yzVKaTCApDuXyR5Xq4ssTvqfkR/TNu7HHCdsbiRUIONAGHIGRdLl +9WoIwJXiS1s8Ju0xM2SpkbEDl6mFBQb2W136tvzs88kNQ1nIXNua6/3LCObXNvkQ +mGP0SBxhAoGBAPhusTUj0zje9/918meDMmGPPDuu2X61qY6BW0R7ITtEgvXvi6J9 +hk4dI1TnfoNCs1emrzpHcQlwGQowdkivjwmHTd+SgJTiss6MjwdPa/fXKbYR6Mx/ +18upP12B9yv4jqussGBt0GzQjxWszbB+LUSeJGasGZsh0XaAx09L5KEPAoGBAPAp +LuUSvOw1lgxjVzU4xEpmyfw4xg3zoAcPtTZn9W9StQ6vsuM3Fj0qokAJKcjnOtPx +XbxLpIlIxBdjEPNkFlgvWPn6nscvzLLT0wywVcswXsXGN7KSbDxRq/BMF1NNcb43 +OuDSplcCJ9MiySoA4+N2St3ylkMnJkWTiPHxOF1ZAoGAD5GIQ2dCVl8KtZSjoz8C +ikCaqrbTZHBn9sk+efUpaPhrKJRhcMZjA0QqMajsMbedW5HTi1hsygWfXBcbYoS1 +9wfmpmsc6benMvB2CiQ9BOQT9hf7Oc2NLXMmyGpbngLOlg2VZAWduSP8w4P3w+a0 +WYd7in+gfytIYB/D3cFIy5sCgYACWVTFFs7UPJ3wFxSmR5zb4W9+UQvW3RgmmYe7 +NX8YDKYKs7s7L7G+/WjC2ZQYC/LuWcEB83dzhEuusuBakRMK38OuBj6BUj1dTmcV +C7B7IUj8BDlNPNNkL6RP4F6mCO7g3mdsBYNs/G9pSEDRcVrJQcHvs8y2cW6VZaEE +RMi5WQKBgESB2zO/8yXLOdotbGLKaZnXbvzeL/giKXrWsq5R4WzsDXAor6L3yEoT +0nptlAPxP3pU4TJev3Ms4dKGzzCOEUjaUx8TW5X959bnmcy8UJeoPYWb7yKdCyuM +zl6TJ7tpDbjBoOKrDQzqmjvwOTEd/mb6ZllyHBxdZRsQzABLvE3x +-----END RSA PRIVATE KEY----- From fbc2974ef81847550dc1a857f5b6bebb1985969c Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Sun, 6 Dec 2015 13:13:46 -0800 Subject: [PATCH 2/3] bump mavis version --- ansible/group_vars/alpha-mavis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/alpha-mavis.yml b/ansible/group_vars/alpha-mavis.yml index 843dc3f2..9682105a 100644 --- a/ansible/group_vars/alpha-mavis.yml +++ b/ansible/group_vars/alpha-mavis.yml @@ -4,8 +4,8 @@ container_image: "registry.runnable.com/runnable/{{ name }}" container_tag: "{{ git_branch }}" repo: "git@github.com:CodeNow/{{ name }}.git" hosted_ports: ["{{ mavis_port }}"] -node_version: "0.10.38" -npm_version: "2.1.18" +node_version: "4.2.2" +npm_version: "2.14.7" # for redis redis_key: "frontend:{{ mavis_hostname }}" From 587c392a5e17db85c2626d72e726ffae9a58834a Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Sun, 6 Dec 2015 17:59:20 -0800 Subject: [PATCH 3/3] make swarm_container_name an env --- ansible/group_vars/all.yml | 1 + ansible/group_vars/alpha-mavis.yml | 1 + ansible/group_vars/alpha-swarm-deamon.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 126ed368..36ce2ee0 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -109,6 +109,7 @@ shiva_port: 3000 # swarm swarm_master_port: 2375 swarm_host_address: "{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}" +swarm_container_name: swarm # navi/link navi_mongo_database: navi diff --git a/ansible/group_vars/alpha-mavis.yml b/ansible/group_vars/alpha-mavis.yml index 9682105a..32786843 100644 --- a/ansible/group_vars/alpha-mavis.yml +++ b/ansible/group_vars/alpha-mavis.yml @@ -27,6 +27,7 @@ container_envs: > -e CONSUL_HOST={{ consul_host_address }} -e CONSUL_PORT={{ consul_api_port }} -e DOCKER_CERT_PATH=/etc/ssl/docker + -e SWARM_CONTAINER_NAME={{ swarm_container_name }} container_run_opts: > -h {{ name }} diff --git a/ansible/group_vars/alpha-swarm-deamon.yml b/ansible/group_vars/alpha-swarm-deamon.yml index b2d16ddd..141821c3 100644 --- a/ansible/group_vars/alpha-swarm-deamon.yml +++ b/ansible/group_vars/alpha-swarm-deamon.yml @@ -8,7 +8,7 @@ container_tag: 1.0.0 log_driver: json-file container_run_opts: > - --name swarm + --name {{ swarm_container_name }} -d container_run_args: >