Skip to content

Commit e88780b

Browse files
bkendallbkendall
committed
Merge pull request #224 from CodeNow/mavis-with-consul
name swarm container, add consul to mavis
2 parents 3d5e263 + 587c392 commit e88780b

6 files changed

Lines changed: 59 additions & 2 deletions

File tree

‎ansible/group_vars/all.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ shiva_port: 3000
109109
# swarm
110110
swarm_master_port: 2375
111111
swarm_host_address: "{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}"
112+
swarm_container_name: swarm
112113

113114
# navi/link
114115
navi_mongo_database: navi

‎ansible/group_vars/alpha-mavis.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ container_image: "registry.runnable.com/runnable/{{ name }}"
44
container_tag: "{{ git_branch }}"
55
repo: "git@github.com:CodeNow/{{ name }}.git"
66
hosted_ports: ["{{ mavis_port }}"]
7-
node_version: "0.10.38"
8-
npm_version: "2.1.18"
7+
node_version: "4.2.2"
8+
npm_version: "2.14.7"
99

1010
# for redis
1111
redis_key: "frontend:{{ mavis_hostname }}"
@@ -24,9 +24,14 @@ container_envs: >
2424
-e RABBITMQ_PASSWORD={{ rabbit_password }}
2525
-e RABBITMQ_PORT={{ rabbit_port }}
2626
-e RABBITMQ_USERNAME={{ rabbit_username }}
27+
-e CONSUL_HOST={{ consul_host_address }}
28+
-e CONSUL_PORT={{ consul_api_port }}
29+
-e DOCKER_CERT_PATH=/etc/ssl/docker
30+
-e SWARM_CONTAINER_NAME={{ swarm_container_name }}
2731
2832
container_run_opts: >
2933
-h {{ name }}
3034
-d
3135
-P
36+
-v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
3237
{{container_envs}}

‎ansible/group_vars/alpha-swarm-deamon.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ container_tag: 1.0.0
88
log_driver: json-file
99

1010
container_run_opts: >
11+
--name {{ swarm_container_name }}
1112
-d
1213
1314
container_run_args: >

‎ansible/mavis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
- hosts: redis
3+
- hosts: consul
34
- hosts: rabbitmq
45

56
- hosts: mavis
@@ -8,5 +9,6 @@
89
roles:
910
- { role: notify, tags: "notify" }
1011
- { role: redis_key, tags: ["setup", "redis_key"] }
12+
- { role: docker_client }
1113
- { role: builder, tags: "build" }
1214
- { role: container_start, tags: "deploy" }

‎ansible/roles/docker_client/files/certs/mavis/cert.pem‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDaDCCAlCgAwIBAgIJALSmsYYWe2lHMA0GCSqGSIb3DQEBCwUAMIGQMQswCQYD
3+
VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
4+
aXNjbzERMA8GA1UEChMIUnVubmFibGUxDDAKBgNVBAsTA09wczESMBAGA1UEAxMJ
5+
bG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBvcHNAcnVubmFibGUuY29tMB4XDTE1
6+
MTAxMzE5MjEzNVoXDTE2MTAxMjE5MjEzNVowETEPMA0GA1UEAxMGY2xpZW50MIIB
7+
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Q+9XmQj8hgPzt4SWTFE5Bg8
8+
luxX15L3GdGrd4u8wyq49yuAQcHETp2uQzHtKrYXhRDqR2CNrBERMXUndHZLSDnU
9+
91GWaYl9sfFHJm1q/GC+kAdvKReaOR80a+zZjponDU02lgji6Km9CD/f92wDF0HO
10+
A4usSB1V7n06sBYE+VY0kyZDIfra07WnSG6FnQgsY38q7+UaNEy5NbA4jwo4VsWc
11+
vl9prBAsi8GwRpIu6b1E+0puHauRSz48N0Xe8el4Vms1jV2agdCWD39Xif+1BvSt
12+
DqEg09PgO4QKkDYpF/WAfc1+esekGC0OWRsdadR5fiJrb60aKI+pYIXky0ZxNwID
13+
AQABo0MwQTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIAYDVR0RBBkw
14+
F4cEChQBO4cEfwAAAYIJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQA3yexj
15+
BTKok47lq87ALPOMdbaTUXnzrFhalEZJAKLdiglh42EWIjS+rXkKaqUIh1iB9i/s
16+
4AFqGLqJUh89LR8X27bYc2fpJxCsyVv/uQzGSD2MKsCpyVWuOmj1ro8jhqNzp+5R
17+
CcK7Zht85a+PKGeIy5DGleFQYoVDvW1J9niMpbG0LdEIavJq1oibMZo0VfZtwBkD
18+
BnMJsoDbBWiykPYvPEOnMTOB6k1CsxT2GU2hNhQV7YGrlk0QUCk4CbwRwScCFfy3
19+
QrqE7fpAjTmpVXqvmSke/hjKknvbfzXt92tGH85PxbUasmnqlSjYkqJxj/NaAJ50
20+
SSxD6qKqFNjF4Pdh
21+
-----END CERTIFICATE-----

‎ansible/roles/docker_client/files/certs/mavis/key.pem‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEowIBAAKCAQEA6Q+9XmQj8hgPzt4SWTFE5Bg8luxX15L3GdGrd4u8wyq49yuA
3+
QcHETp2uQzHtKrYXhRDqR2CNrBERMXUndHZLSDnU91GWaYl9sfFHJm1q/GC+kAdv
4+
KReaOR80a+zZjponDU02lgji6Km9CD/f92wDF0HOA4usSB1V7n06sBYE+VY0kyZD
5+
Ifra07WnSG6FnQgsY38q7+UaNEy5NbA4jwo4VsWcvl9prBAsi8GwRpIu6b1E+0pu
6+
HauRSz48N0Xe8el4Vms1jV2agdCWD39Xif+1BvStDqEg09PgO4QKkDYpF/WAfc1+
7+
esekGC0OWRsdadR5fiJrb60aKI+pYIXky0ZxNwIDAQABAoIBAQDBkB747DamdLF8
8+
YBfhF/hdcHux5Sy3kAnF2cuNB/OILE1eizSEaIe/u1nl2Ote08kI7RmGmnxPcgVT
9+
jDdulGjF3bIwjgRcNqK8TOWI1stKPJdIS8RY3o9p7a6+DAJMW18fvwcc6Nh7361t
10+
0o8SkRSoFjEh5Lj7U9HwtvUtFbyfzxEj6gtGKmQ0FJMVZhQ8CSsewJsoPYvm7n6F
11+
1V3UF/2cH989yzVKaTCApDuXyR5Xq4ssTvqfkR/TNu7HHCdsbiRUIONAGHIGRdLl
12+
9WoIwJXiS1s8Ju0xM2SpkbEDl6mFBQb2W136tvzs88kNQ1nIXNua6/3LCObXNvkQ
13+
mGP0SBxhAoGBAPhusTUj0zje9/918meDMmGPPDuu2X61qY6BW0R7ITtEgvXvi6J9
14+
hk4dI1TnfoNCs1emrzpHcQlwGQowdkivjwmHTd+SgJTiss6MjwdPa/fXKbYR6Mx/
15+
18upP12B9yv4jqussGBt0GzQjxWszbB+LUSeJGasGZsh0XaAx09L5KEPAoGBAPAp
16+
LuUSvOw1lgxjVzU4xEpmyfw4xg3zoAcPtTZn9W9StQ6vsuM3Fj0qokAJKcjnOtPx
17+
XbxLpIlIxBdjEPNkFlgvWPn6nscvzLLT0wywVcswXsXGN7KSbDxRq/BMF1NNcb43
18+
OuDSplcCJ9MiySoA4+N2St3ylkMnJkWTiPHxOF1ZAoGAD5GIQ2dCVl8KtZSjoz8C
19+
ikCaqrbTZHBn9sk+efUpaPhrKJRhcMZjA0QqMajsMbedW5HTi1hsygWfXBcbYoS1
20+
9wfmpmsc6benMvB2CiQ9BOQT9hf7Oc2NLXMmyGpbngLOlg2VZAWduSP8w4P3w+a0
21+
WYd7in+gfytIYB/D3cFIy5sCgYACWVTFFs7UPJ3wFxSmR5zb4W9+UQvW3RgmmYe7
22+
NX8YDKYKs7s7L7G+/WjC2ZQYC/LuWcEB83dzhEuusuBakRMK38OuBj6BUj1dTmcV
23+
C7B7IUj8BDlNPNNkL6RP4F6mCO7g3mdsBYNs/G9pSEDRcVrJQcHvs8y2cW6VZaEE
24+
RMi5WQKBgESB2zO/8yXLOdotbGLKaZnXbvzeL/giKXrWsq5R4WzsDXAor6L3yEoT
25+
0nptlAPxP3pU4TJev3Ms4dKGzzCOEUjaUx8TW5X959bnmcy8UJeoPYWb7yKdCyuM
26+
zl6TJ7tpDbjBoOKrDQzqmjvwOTEd/mb6ZllyHBxdZRsQzABLvE3x
27+
-----END RSA PRIVATE KEY-----

0 commit comments

Comments
 (0)