Skip to content

name swarm container, add consul to mavis #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkendall merged 3 commits into from
Dec 7, 2015
Merged

name swarm container, add consul to mavis #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab8bf23
name swarm container, add consul to mavis
Dec 6, 2015
fbc2974
bump mavis version
Dec 6, 2015
587c392
make swarm_container_name an env
Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions ansible/group_vars/alpha-mavis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Copy Markdown
Contributor

@bkendall bkendall Dec 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we running tests for mavis against this new version pair?

Copy link
Copy Markdown
Author

@anandkumarpatel anandkumarpatel Dec 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep :)


# for redis
redis_key: "frontend:{{ mavis_hostname }}"
Expand All @@ -24,9 +24,14 @@ 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
-e SWARM_CONTAINER_NAME={{ swarm_container_name }}

container_run_opts: >
-h {{ name }}
-d
-P
-v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
Copy link
Copy Markdown
Contributor

@bkendall bkendall Dec 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you want to link these containers? I'm not sure how naming the swarm container is allowing mavis to talk to it...

Copy link
Copy Markdown
Author

@anandkumarpatel anandkumarpatel Dec 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mavis uses the name 'swarm' to talk to the swarm container on the dock. This is so we do not have to find the containerId and can just use the name swarm

{{container_envs}}
1 change: 1 addition & 0 deletions ansible/group_vars/alpha-swarm-deamon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ container_tag: 1.0.0
log_driver: json-file

container_run_opts: >
--name {{ swarm_container_name }}
-d

container_run_args: >
Expand Down
2 changes: 2 additions & 0 deletions ansible/mavis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- hosts: redis
- hosts: consul
- hosts: rabbitmq

- hosts: mavis
Expand All @@ -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" }
21 changes: 21 additions & 0 deletions ansible/roles/docker_client/files/certs/mavis/cert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-----
27 changes: 27 additions & 0 deletions ansible/roles/docker_client/files/certs/mavis/key.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-----