diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-07-01 12:23:56 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-07-01 12:23:56 +0200 |
| commit | 9dd3c07e00f90c48eb0d34240df6e9eb14e7c96e (patch) | |
| tree | a98900ab50709ab164274f31f0ec9428813aba89 | |
| parent | 4c0e88611d5887dabe780eac6db324b7c806214e (diff) | |
correct name for the wordpress containersunet-ops-2015-07-01-v01
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 14 | ||||
| -rw-r--r-- | web-a2.sunet.se/overlay/etc/hiera/data/secrets.yaml.asc | 32 |
2 files changed, 30 insertions, 16 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 6cddc17..db901a8 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -291,6 +291,20 @@ node 'sto-tug-kvm-lab1.swamid.se' { #} } +node 'sto-tug-kvm-lab2.swamid.se' { + sunet::cloudimage { 'met.swamid.se': + dhcp => false, + repo => 'git://git.nordu.net/sunet-ops.git', + tagpattern => 'sunet-ops', + cpus => '2', + memory => '8192', + ip => '130.242.125.88', + netmask => '255.255.255.192', + gateway => '130.242.125.65', + resolver => '130.242.80.14 130.242.80.99' + } +} + class sunet-dhcp-hosts { dhcp::pool {'sunet-servernet-tug-130.242.125.64/26': diff --git a/web-a2.sunet.se/overlay/etc/hiera/data/secrets.yaml.asc b/web-a2.sunet.se/overlay/etc/hiera/data/secrets.yaml.asc index 69fdb96..710828e 100644 --- a/web-a2.sunet.se/overlay/etc/hiera/data/secrets.yaml.asc +++ b/web-a2.sunet.se/overlay/etc/hiera/data/secrets.yaml.asc @@ -3,20 +3,20 @@ STATUS=UPDATED -----BEGIN PGP MESSAGE----- Version: GnuPG v2.0.22 (GNU/Linux) -hQEMA3weZMuejRhfAQf/cCgLzTvLv5OPquI7JE5Kwl/JXcGly8Q6EJRj8bsfaYi0 -9q4UB0TcW7y04zFpUw9r7ik0QV3e/mA/KM7+diJUNNVGvXS4+DFbaN0Qr2U92HvP -crM5FNdCs+hTw0UrR/LS1P+VApV+JlHmgkMZx3I359Ub5CcUZ26pz5sf2W/CiG6p -VeZhktxHTW1HveBC2239lM9yt0102QOxAG+rkBvwec04Xiv9bXYgxuQZ2po/uLyI -NfYuhGt7zASi1eL79mfj+j6PdKbnF7ggmm8p0cgZ3H9D0gdilUVrKPm+ocVrlRU0 -j0PetOKAsMCbdaFt3SZFKaqhEVuP9/R6VPmVrqLuJNLA6QE3mHJu9QzNRixPdhIz -rhFJTrgVmUvh0uQTj00Kaxsz53RtPjK3NTnQkjgnjGhLGhCAn1qUA5KTCfFJQxui -PddNHpr46mtqaLWz5pSAYNMvLAQTIOe1iQMZupgXWF/uGTLCp50Uej0CxdiPR3Ve -UkTE5Rfs3dFJIhlqPrs2eB4G8fOc6Sb7R11HlkLKEQcxhyz73qHVN3prgBHqthfb -NjgJLt/4wNOt6fjGqW6f9s4LCBuvM9ID/n3gXO+0lfQA6EGgyfyZi+XUTDJZ/2ye -Z6eOpz+occy5i55NrggtI8poZGIXlWmUcDPN+/CX6tSzy0AJMllMWzJv4Q2ipW0c -Wal2BjcmhaeNFcF/Uyvr925JEOZ++uN6VVk6T5By2lmXpY7uGQERkUo7woqBB1yP -JEbSXwwIdbL36NaVqj1xFCrDHTzh+wSOUEFXKjrIRhMxxWvCfvMvwaMN3MfLNMhw -qMNuKlXIWvKvlsFhEfdNiWbGeA7DoPSCXIgsqhTuhOdIa5FnDi6zMI5YQcG2Qe90 -0GEuk41fZYlCvTjc3c4CSS92/zpSevX5yRbR -=l24P +hQEMA3weZMuejRhfAQf+LTny3iW42v862Itajn9+2MAo37ENqAERY+efpGNT8d4e +hqRglwCrZMW3Grta/eCGAbSr5cver2eiH5JiBAZwhQQ8zTy+LU18omEzGlBdP6nw +T7Vo5mfnPEFJ42yjGJNe6eRTWVNOC77nSYUfmKoEqETf5QzTmOsVJTxu+vqgzX5a +8z1GwLD14tgS3IwB3BA0W6gRobfPQFFQGe4VEnJ8oWLiuRO+2SmXBNbMNvgjcohx +zpep2mMEMevZMwdjwm0jUZ404GVRp59gz55m5uhywp7vhwNBZblN9rd+VxsCN2gX +8TDHEmlRWOEGzNkMc9M5k6g6k6ShbhYv6aBeC2HjPtLA7gGqZiMzIv7WxHNqW877 +IO3T7uR+YgEOXjlcs5laMtzi5hyzz5PofAgWqO+DFJGKBjm+9dfGQhKnFIeXenq/ +L8RKtyFJN20jP+EZy/MNZHbRWGlwq5juRdFCA5M2okpktJCQYXA83e/trrdkR1qT +jSduLaHOx++ju8kW7LcOy5GzKZIJdWBM2fGW71NWRX1HfUVZDiaBSTcLeCEIZfyB +/bgqo9j1Eyc9x+VlQfhBNy0ZnUUuK3znbE2Dx68F+owO8v95cNj9kRb77j7uc+HG ++GzI2jkP4++gNRdyTUiJl4Y7a3PpHHRRZmPOYrjOu8g5h5zd/KCtM6c1kNCckzKu +GcI7ucH3QmHJUDkuJQ033TARwCTaunrYAiKZUC034NmP7mk23d1VCfhH4np/cCVD +/HH/aQxnHY9ZqsOGys9jkOTNMSl1EtH5IM07Kpjaag2MitxF34dB+Hs1WGIO/39G +s/wAKjDLjbk5H/63UQ7iIn9JF/jlHMlv9RWCxs/Vc+CV7Ng6DU3V4qRmmypye5cz +uSKjlNRazop+VarulU/2iC4Xhp6A+ZFkoPMxnujv/yk= +=ejCP -----END PGP MESSAGE----- |