Skip to content

Commit

Permalink
Merge pull request #60 from panli889/master
Browse files Browse the repository at this point in the history
update registry and console version, modify a bootstrap step
  • Loading branch information
panli889 committed May 30, 2016
2 parents ba17fef + 0a869b9 commit 81cd449
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions playbooks/roles/bootstrap-images/vars/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"networkd-binary": "networkd-binary:0.1.12",
"deployd-binary": "deployd:2.0.2",
"lainlet": "lainlet:2.0.2",
"registry": "registry:release-1463724658-aac5b75fcc96e7eaacd023a42326c49c9aeec68c",
"registry-meta": "registry:meta-1463724658-aac5b75fcc96e7eaacd023a42326c49c9aeec68c",
"registry": "registry:release-1464060746-b1033b6544555a0b7e8775a994b8a891aaab0a11",
"registry-meta": "registry:meta-1464060746-b1033b6544555a0b7e8775a994b8a891aaab0a11",
"tinydns": "tinydns:release-1462424821-15ab41349dce81ddb9bc5c10309bb43b9aa0c573",
"tinydns-meta": "tinydns:meta-1462424821-15ab41349dce81ddb9bc5c10309bb43b9aa0c573",
"webrouter": "webrouter:release-1462260224-41bff528f481a2ec6b01ca975fd17dea1b67bdb5",
"webrouter-meta": "webrouter:meta-1462260224-41bff528f481a2ec6b01ca975fd17dea1b67bdb5",
"console": "console:release-1462949955-ec2dab7586e5fedae2311f380c86c447b39ddbea",
"console-meta": "console:meta-1462949955-ec2dab7586e5fedae2311f380c86c447b39ddbea",
"console": "console:release-1464333027-ff36caebb2677611fcd40d8097cc11554c9503c9",
"console-meta": "console:meta-1464333027-ff36caebb2677611fcd40d8097cc11554c9503c9",
"backupctl-meta": "backupctl:meta-1460534637-7bb87af249b1672e18baacbacb6d3ffd6155e81c",
"backupctl": "backupctl:release-1460534637-7bb87af249b1672e18baacbacb6d3ffd6155e81c",
"lvault-meta": "lvault:meta-1462443822-81ed22691e022c788be3cb1e5cc1259c54daafcd",
Expand Down
3 changes: 3 additions & 0 deletions playbooks/roles/bootstrap-webrouter-stop/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
- name: remove registry.DOMAIN
set_dnsmasq_domain: domain="registry.{{ domain }}" record=""

- name: wait for DNS resolution ready
pause: seconds=2

- name: check new webrouter works well
shell: "curl -s registry.lain/v2/"
register: result
Expand Down

0 comments on commit 81cd449

Please sign in to comment.