summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-04-22 15:21:41 +0300
committerLars Wirzenius <liw@liw.fi>2018-04-22 15:21:41 +0300
commit89e51f95f8081b88bbaa5ff438f33629306a03c6 (patch)
treeeb59cd5206eb38ca3badbd9b9f8e90cadf0e82d3
parentd66b8fc2fd86709aaf6594985baf31393e404560 (diff)
downloadick2-ansible-89e51f95f8081b88bbaa5ff438f33629306a03c6.tar.gz
Change: make test-ick work
-rw-r--r--group_vars/all.yml31
-rw-r--r--hosts.in12
-rw-r--r--ick-cluster.yml1
-rwxr-xr-xrun-cluster.sh3
4 files changed, 40 insertions, 7 deletions
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 40a84a6..83580af 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,3 +1,34 @@
+ci_prod_apt_signing_key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+ mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp
+ 5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS
+ +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO
+ HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p
+ JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM
+ jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM
+ 3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4
+ 6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe
+ UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5
+ TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl
+ kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB
+ tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3
+ LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ
+ CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h
+ dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ
+ LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN
+ 31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw
+ P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv
+ 2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM
+ cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD
+ SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441
+ 6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK
+ Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod
+ GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps
+ GSJSdir7NkZidgwoCPA7BTqsb5LN
+ =dXB0
+ -----END PGP PUBLIC KEY BLOCK-----
+
code_liw_fi_signing_key: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
diff --git a/hosts.in b/hosts.in
index ddea3fa..5e89777 100644
--- a/hosts.in
+++ b/hosts.in
@@ -1,6 +1,6 @@
-controller ci-prod-controller.vm.liw.fi
-apt ci-prod-apt.vm.liw.fi
-qvisqve ci-prod-qvisqve.vm.liw.fi
-artifacts ci-prod-artifacts.vm.liw.fi
-worker1 ci-prod-worker1.vm.liw.fi
-worker2 ci-prod-worker2.vm.liw.fi
+controller ickdev-controller.vm.liw.fi
+apt ickdev-apt.vm.liw.fi
+qvisqve ickdev-qvisqve.vm.liw.fi
+artifacts ickdev-artifacts.vm.liw.fi
+worker1 ickdev-worker1.vm.liw.fi
+worker2 ickdev-worker2.vm.liw.fi
diff --git a/ick-cluster.yml b/ick-cluster.yml
index f865181..f458264 100644
--- a/ick-cluster.yml
+++ b/ick-cluster.yml
@@ -61,6 +61,7 @@
allowed_scopes:
- uapi_version_get
- uapi_projects_get
+ - uapi_status_get
- uapi_projects_post
- uapi_projects_id_put
- uapi_pipelines_get
diff --git a/run-cluster.sh b/run-cluster.sh
index 4bf44fb..8311fb7 100755
--- a/run-cluster.sh
+++ b/run-cluster.sh
@@ -3,7 +3,8 @@
set -eu
-hosts_in=hosts.in
+hosts_in="$1"
+shift 1
getip()