diff --git a/contrib/ssl-ipv4.conf b/contrib/ssl-ipv4.conf index 8a0ee67d3..6d5e97da9 100644 --- a/contrib/ssl-ipv4.conf +++ b/contrib/ssl-ipv4.conf @@ -26,12 +26,10 @@ basicConstraints = CA:TRUE subjectKeyIdentifier = hash authorityKeyIdentifier = keyid:always,issuer:always subjectAltName = @alt_names -issuerAltName = @alt_names [alt_names] IP.0 = 127.0.0.1 -DNS.0 = 127.0.0.1 -DNS.1 = localhost +DNS.0 = localhost [ distinguished_name ] commonName = 127.0.0.1 diff --git a/contrib/ssl-ipv6.conf b/contrib/ssl-ipv6.conf index 55486d1af..447c1c459 100644 --- a/contrib/ssl-ipv6.conf +++ b/contrib/ssl-ipv6.conf @@ -26,12 +26,10 @@ basicConstraints = CA:TRUE subjectKeyIdentifier = hash authorityKeyIdentifier = keyid:always,issuer:always subjectAltName = @alt_names -issuerAltName = @alt_names [alt_names] IP.0 = ::1 -DNS.0 = ::1 -DNS.1 = localhost +DNS.0 = localhost [ distinguished_name ] commonName = ::1 diff --git a/files/ipv4.crt b/files/ipv4.crt index b82514f22..859954d40 100644 --- a/files/ipv4.crt +++ b/files/ipv4.crt @@ -1,27 +1,26 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/files/ipv4.key b/files/ipv4.key index 52f655128..260c0fe59 100644 --- a/files/ipv4.key +++ b/files/ipv4.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkneWD3CMk92DW -sB60wgPJA9NhYqP+mmJP/qyMh4sRDGkbMpkYkEaYJoRoXhUSegfvnmY+mY8kBoty -DMUx/sG0qp5DFt6Y4G/0fIrs/POc8PBjQq6un8EOCstF4G64d+dAddKwHee4hNe7 -+5Hlb/YjaYgTXedqt7uJWct1qzc1oF0bGP4deqhcIbJ7He/GFlTwukkfPRgqy3O0 -grXodbptuvJTTDALjF+5Xp/Teh9jRxIAI8L5RKJiJQS90Ym/amMR8y0fiIpMrG19 -F8Yd967VGNCF56G+xjEwyekJzEKdHaEPM+VnthYNfQwuxLMstBeuTwyKEQN2lxtA -+FTgWnPTAgMBAAECggEBALULxgLShpJzxaC/ANItA0phWTi6IR0zrb+j84mmnZ72 -sRX00AD/4KgFeL4eI5nqQfak/lt8yDrDZBMBwfiBw20L4SFILyfqNT7skihzeYlD -1VsGJ8fqg7xXF/tSbNxxOBV4OU13oVYi/aXE6BlGvSn2HOkZaHa+4ik3j0S0Ppib -02VNndr+1jY/YEWwj6vhQMZumx2ejiIjGlIv6mr/3TRbARCwg9FhFP0DHGrLnVzL -xpEokTPikL2YXIC8fiL4deGtfiof9n5GlaqSmfl+PBtIWAAzGoVDUe989Mc931ey -lnPsJEgTUpdvYAHQMyfjwzdYG/XxZP75bBuDN7nmo+ECgYEA9jSvxC8WSB7XROv3 -XLTr8+A4fX+SSkTLG6hnjHQZbhl46kxGXjuPs8BTF6XY9V2isxxuP9s+p/9LS7r1 -/oj9Zta49JCa4UL0/IS9k3smXR4OlgxXjw0mfUgJSLb61qqPhgkXPx0OvWn0SArR -GEGe7/vp19wi8dA5Xng4GQb+d90CgYEA7bYWL5Hfn/Z4lZYrqH3vERltmo2vSMZo -OLCG5+VxbaH5b89gKXHjlTu2i/UA6g32bpIHsl52p4m7vfpPOlI7iX1JkmRcFmRF -6ektrwPZmRdwkqB+t3qlcr79LVWqdh7cFrDJF0ki7GKSkyoB+9U1BhnD9DDabD/V -+mWrPpsUN28CgYA3L8QeM3fJHrCeEE5YB23EMoQ3DTtbTmRAhNUBFJ0GossJqaM0 -SCGD5x449MHW7fAkOcE0qw42VfEovnWZYld6j7LRjwBIcdu8Jnzf7ADDapNWatnN -hOMVvenm1K0RJRYaszr0uKyvJGrPIy2PRFY98LeP3RYwIb5aQJRCd+DeOQKBgQDo -COm3HYlQN+KVAbU0D1mhM1UNnGgRfbqWO5o0Gn+SKJ23SpHvYsBoF5WlIE74KRD3 -9YuVzSe9enDMjN1xbHu5RZbfUx+gq9ii734sbHGnQn4cYpXOu+VsEIpKCmkOTClB -7Ocd18JDRCUXidXN4NyVS+k/H8DWEanpdfyma/Jb+QKBgHAK7Uo1HqolYBae1p+2 -CE0zBANtOd7f4TVkVnEuLV/cdrihy4nBl97qKt2sTZ9yjDlmXpGYEgahBElr2Rbi -lvzzoVs2N/aBwneJVA+gqmyiMQufkSKr1f3VngrSt1lB3fvWVq1s/xameKn0h13p -m66Wi1PjtjbaOzoNDWZbnISC +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIAZ3m0hy+8vBP +UPfQ5kYUfA3eajX99FsalZgcBTkRoHfjNMUV3bS0pPncQoPQ6kh9MCMUPMfARrb1 +5y+eSwh8SABq5veRoxMgGTZP+ogquJR+D0MAMvjYOJDmg6NRjwsNb1KWfoEHDx0u +J6qpkhl7yqNLLJUHi8deFFmjag+eCEAo28P/u1OhRBCJXMcm+QSf4ipxiFJSGYlW +Q4ispu14AlvjoUKJ1UHC8aEGugNzuZeY1I4CeffK7bolb9hASxKG/bUw8MoDFjng +IdV9u949LlZ12wcyHBWhGEfD4v/s7ZG7sHiTH5pfX2AL05hF3BXuHk+WH+Anm6wP +Em/f0xMNAgMBAAECggEAX/9mqsNuyLgSX/+c8seUG4DvpzGTeLEwiTIEMG7RVYSQ +Bp3tevFPKuWEiBPk8QGCiZPxQmVp+v/2EVFFqdSZ3g0xJh519ZEwPNfdGcZGVTsD +Cv6ISjAtAJsl8X59hUgDJg+otFND2v+GIgEoCPv2/1PjzNE5NsYAi0d5PtZJaK/y +ujL9GgMwCfdNahmjiNf4cVlllbiKTMhCfrUj1AqCEOUOXGidhOhSulZkKRnvJ69b +VLJj2LWDKktldj1Vk+gheiG3KIfBhOSGUTJBHmu2U3n2pv2xpxLVjrke1iiTK+LA +4Hh029SktD3TtXkWMuusZ7tn6GOrpNV6SiY93zfUAQKBgQD671uIGzsE+Bh5vE1X +UJfVw0SzB3+JpK5N3G1QDPD6GKU+kCXW2HedRoCpCJ4jm0H19PJpIEfXqhw4dGs1 +Z911ykU1BpzL2NR35k4eG77ZOzrEocmLzVvJgblevsoHGmrvOQu4EdDYXbQnr7pZ +Oiy27DSWy0joQ4bwR8u8MuCn+QKBgQDMCxks8UKBE6AR+MEynedK6X3Eo1f0IB3C +12X01otSNJh/fslWfPjs3PxPPWiAxsU21P4SCuBiiemZHdqcdHFYOfXSHdYf6uyB +u+fhb6/DpaCr3QSFQEE8e/ahBIQxKyM27XkWR++ykaodHkXx3IhQAVQb+/db02eO +d5TDxxLQtQKBgHi3vaj0sKfrUpr945clxmWn0tzttoVZHCGI8W2ZTDSEtroqTonV +CXY3/J1U7/7hKhJRDG1WgjlWNM1T9F904C1SaYjg7X2DinND8EC7yExpGhSOYI9I +8+c06SCTWE2if98l6mVa7MWqDokpGNTkD67QY1xH34MdOUVOxMx9DWbBAoGBAJAV +2j5RU/wgJq3qMkuTE8xjm4trKWXb9Agt4PKHOjTfrTyDBJxNfd6NoqI2JACj3In+ +2DdXdOJArzOP0FshIxUBQOSSay140HBAh9s66ixHXnFejp2mJSsYAq3rqYmrA5/7 +C8G/JLW9hRow0YWcjKmqdoGYaTFv1LXXHbcuccvtAoGBAJNLw4rXrCuRi6Bm4sj8 +s5XEUCGqzBtdjF/lQQ+pGwM9hisdkSBDfOXDBRvIPZH2E1R1KObBf0G13mdf1k40 +TUKBah16TdLt151p81cvQw7x+SyxSoihTUByoAv9Un2ZefmV/oJWz7vkPh/7nmhK +BbUAj/9a+UzWIusFKlr+y6DC -----END PRIVATE KEY----- diff --git a/files/ipv6.crt b/files/ipv6.crt index ef25a5505..5709a75df 100644 --- a/files/ipv6.crt +++ b/files/ipv6.crt @@ -1,27 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIEmDCCA4CgAwIBAgIJAOe+VTXGt+wyMA0GCSqGSIb3DQEBCwUAMHExDDAKBgNV -BAMTAzo6MTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAw -DgYDVQQHEwdSYWxlaWdoMRUwEwYDVQQKEwxSZWQgSGF0IEluYy4xEjAQBgNVBAsT -CU9wZW5TdGFjazAeFw0xNjEwMjkyMjA0MDdaFw0yNjEwMjcyMjA0MDdaMHExDDAK -BgNVBAMTAzo6MTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5h -MRAwDgYDVQQHEwdSYWxlaWdoMRUwEwYDVQQKEwxSZWQgSGF0IEluYy4xEjAQBgNV -BAsTCU9wZW5TdGFjazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSI -mc5gMO3VQRgv5cBSXX0nJwKK+R2goi0mrQ68X974dO3hx1IQ141CRzqUdHstBcEn -Syq8z/CRRoJGpZoN6xcEOQGc4zs00D8Prwihasp91vQ/m9QKYsb8s/J6m9//67gd -9z/XKO4AnXXCX0NdixECT7ubxXb08RQq9NTAoVmbRSovPduIVXL5g6T/+K1nRgqx -SfGtYbOlyylooWB33uXiZBDhUkWXd/OafwNWc4Q4QT6XDLPVTNXRiyqRTkGNRlmw -+4ZqKlZI9mtyPRfSOhGmCPw1la7BtZ9DnUk2gNvhS8wjmHfxf783xW8bVD9ywG00 -XVRmennYM4EVw/QWJBECAwEAAaOCATEwggEtMAwGA1UdEwQFMAMBAf8wHQYDVR0O -BBYEFHM2RtobYVlNH0cpmXgPIAY+JhWSMIGjBgNVHSMEgZswgZiAFHM2RtobYVlN -H0cpmXgPIAY+JhWSoXWkczBxMQwwCgYDVQQDEwM6OjExCzAJBgNVBAYTAlVTMRcw -FQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEQMA4GA1UEBxMHUmFsZWlnaDEVMBMGA1UE -ChMMUmVkIEhhdCBJbmMuMRIwEAYDVQQLEwlPcGVuU3RhY2uCCQDnvlU1xrfsMjAr -BgNVHREEJDAihxAAAAAAAAAAAAAAAAAAAAABggM6OjGCCWxvY2FsaG9zdDArBgNV -HRIEJDAihxAAAAAAAAAAAAAAAAAAAAABggM6OjGCCWxvY2FsaG9zdDANBgkqhkiG -9w0BAQsFAAOCAQEALe1bw8794PsXz4+QTwRfJ+6x2/rNbcwRxZRf6MAwY/gdyWuq -dl9n+ZxjscXYgHWJCmghKPqFPn/eLtlLtsJXCRHUYYg6adc0zb/cgl9eufHHVJLv -AQSA8+M6eh4biQk/wgHGpzi9FukvXB5MWhjrYkgTwqSqmWgbA/Kp40HcfkRMO/cE -pskM7T3OSelXLVwEDjircneWvI6BOV7+i4knqnfNTgYhQPZ3N91McQnA0CutTzyG -MGEJ/YdmWZxHKx0uZ5KZ01uuVOcWe1aYEeDoqBZPiItRm/NCOwjeOhSbWJJEqqis -HlZQlxjXXAA1MzVgahg6py5IiWxSIzYBfU6bHw== +MIIEZDCCA0ygAwIBAgIJAKony8TXhNTTMA0GCSqGSIb3DQEBCwUAMHExDDAKBgNV +BAMMAzo6MTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAw +DgYDVQQHDAdSYWxlaWdoMRUwEwYDVQQKDAxSZWQgSGF0IEluYy4xEjAQBgNVBAsM +CU9wZW5TdGFjazAeFw0xODAzMTUxNTQ2MTVaFw0yODAzMTIxNTQ2MTVaMHExDDAK +BgNVBAMMAzo6MTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5h +MRAwDgYDVQQHDAdSYWxlaWdoMRUwEwYDVQQKDAxSZWQgSGF0IEluYy4xEjAQBgNV +BAsMCU9wZW5TdGFjazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHt +PU+bPwsWWmcQHWOf2BuQBSHOS7G3LxgFUNJyCos2ssX4b1bXBo8Ur5h+72Pg9xMq +uY7syLeYmTzPuHF1/ZeqWs9ZZJWSmBaOeRX4d/lRqxmITy8LVAFdC51iRFj/21iN +un7fDorHF4jbGze89gvQtAhugOdTgfHd6fh8gYT0NHUkgNuzngOGIYtwd1lu7I/S ++dYNUJ5bEkjkwBarfFdMpZCSJ/IgZOPOk/6MkoItFHoTvOUInF/jBvpAVwzXU7bc +Vc3HsNcdCWQ/2sFtc9GlV6X2wwQxQJ8d6CLSH3Ocys7ZtZ4VoESvR6fPdI2QUQtM +wSfPauTd4qWQrRbbayMCAwEAAaOB/jCB+zAMBgNVHRMEBTADAQH/MB0GA1UdDgQW +BBRqZPvh3qfuK8XMwxdtu622YfjvqTCBowYDVR0jBIGbMIGYgBRqZPvh3qfuK8XM +wxdtu622YfjvqaF1pHMwcTEMMAoGA1UEAwwDOjoxMQswCQYDVQQGEwJVUzEXMBUG +A1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVpZ2gxFTATBgNVBAoM +DFJlZCBIYXQgSW5jLjESMBAGA1UECwwJT3BlblN0YWNrggkAqifLxNeE1NMwJgYD +VR0RBB8wHYcQAAAAAAAAAAAAAAAAAAAAAYIJbG9jYWxob3N0MA0GCSqGSIb3DQEB +CwUAA4IBAQCWiBLymjUceMZQy6FOWMjUflxhhZJZ9PibBKpdFo/LPXU0v9o2u99F +aKzcnxEAl0S1aH6fjc9roaWhH8sY57uYMBFrVZZZEq+pXgAuk42v//pOrGTrE/M+ +5HAl8D3yLV/rBaJamQJOHWFEoifpW03WggL7Ph3JrcE9KswJEonw/fn7iVgjzhVw +kY+Um7tNDQEDksIncBV/IBieYH3MXm0xbmsCBWvFOlJbF2hvTLtPaMoDDAYUr5UI +fUbFYMQVeD5k2eGThMGv9qATuzBj6xGQZ/IVz5jP26aQ2sgyIBHYbKniGqbG9jAw +cP/YMFhFd1DgcZrDZxypxnjzw6Vb4bcT -----END CERTIFICATE----- diff --git a/files/ipv6.key b/files/ipv6.key index ae44b27b1..7a0b21089 100644 --- a/files/ipv6.key +++ b/files/ipv6.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUiJnOYDDt1UEY -L+XAUl19JycCivkdoKItJq0OvF/e+HTt4cdSENeNQkc6lHR7LQXBJ0sqvM/wkUaC -RqWaDesXBDkBnOM7NNA/D68IoWrKfdb0P5vUCmLG/LPyepvf/+u4Hfc/1yjuAJ11 -wl9DXYsRAk+7m8V29PEUKvTUwKFZm0UqLz3biFVy+YOk//itZ0YKsUnxrWGzpcsp -aKFgd97l4mQQ4VJFl3fzmn8DVnOEOEE+lwyz1UzV0YsqkU5BjUZZsPuGaipWSPZr -cj0X0joRpgj8NZWuwbWfQ51JNoDb4UvMI5h38X+/N8VvG1Q/csBtNF1UZnp52DOB -FcP0FiQRAgMBAAECggEBAKTGS0ifdw/NOCyCZgPXV7gCNNJZ4I3BzjpnM+Cq10FN -K4qKczgC6rsP2Z1nH2+oFkAMMNCvlh+S4jF6iEWJ6OvtUC0Z72olphZeGHv+eYcI -TTEMZ8nbS32uyeyCdnsSNTSHtvt92rO7MljsG2NlEL5dJmfzewKhII9cRnjz56RJ -vBUZAMYmlcfHvBFm7nhjngCWlN1bXW+KvPB8Riy9c6CjhFOYuU2gZA+EZFoup5mL -xkLVsT54PJRhIB2FSraL7gSCrZjPTV9WPXoz8/zAis/MUtkXQ1S2H9E1PynnrD2d -XpAQW7Xc3fywU6QCyF8syxED59kEux80FeIjW1Wb4AECgYEA/vcUWX9acXDG6yjy -hwydL5GuEgaP79DQpjCnp3GemkG1G9nff4GoFnUMtD18p7llUDtjpuhZMX7BxdYZ -qxlCML9vRu3w9Tl9iv4vK0Ky+0mQwCe+6arJpRUWgg5GIxIO6JBj2sdPVWvG5ggB -GDJ02xpXymYcuc9M9dU5s74twwECgYEA1WVu15ZGZc4xpjF9U6Sg0k1q5qO9fXCF -X9gRm3AqZO1CAU8n44VwycJOxc/sJZ2P9lR4VROjEX3zBPOKwHOLFDrbQ70OwXVU -uK7dUt1Ff7G/UQFQjKgh1xXf/0WBVwU3WIO7kgGRKqaP/4QCtBNA72vq6KjBbGeZ -EiDnrKW5MRECgYEAk0NouIyrU4xdCGR9OG2buGb/UKADsPM+IE9H9pnUjqpXDgAY -bBAaYuY2cUB2aHXXw7CZzUS0h7b7+uW/q6iKJ5fakPBL1YfgMFDCM81xjVyfQ61x -QouHrlbwyiuubQE4JTGIy0uFUgRPPHvxDeXOwuKDRH8YJmZKwE7o5h15VwECgYBE -YORLoJOeO5wdLO6DxtThjn0auo0VjOCv/YRm0mJDRONJmBuoBDJH9ENZj26T/xEK -VbbZTBmMmVct1vw2/s8qBFIOOp5nzzj+lMnGq7CBYmtzgYBWEeoGCbRlD9iKEdnS -OyP3fRkPGaA6uApFuYWtMl9rfee83NVnwbN61v+ogQKBgHUCFnGSryJU0Is2PnQD -uAipiNWLqsphF9qtVCi8WTYN9flqNaD5n2WAx78r51YIftTz9lx0kG5ZZE+jHjTk -L8DRx8iy1QBlnoJOVPY38wB3y5IA93s8D//V4jtg75oa4ggAwLxu8uPdrw6s56tO -49fgOJbBvVCZqds9wlgUIP2A +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDR7T1Pmz8LFlpn +EB1jn9gbkAUhzkuxty8YBVDScgqLNrLF+G9W1waPFK+Yfu9j4PcTKrmO7Mi3mJk8 +z7hxdf2XqlrPWWSVkpgWjnkV+Hf5UasZiE8vC1QBXQudYkRY/9tYjbp+3w6KxxeI +2xs3vPYL0LQIboDnU4Hx3en4fIGE9DR1JIDbs54DhiGLcHdZbuyP0vnWDVCeWxJI +5MAWq3xXTKWQkifyIGTjzpP+jJKCLRR6E7zlCJxf4wb6QFcM11O23FXNx7DXHQlk +P9rBbXPRpVel9sMEMUCfHegi0h9znMrO2bWeFaBEr0enz3SNkFELTMEnz2rk3eKl +kK0W22sjAgMBAAECggEBAK1vpKTdbVN6r0vQ64cAa6ox7ZuFddIotvbQhXqoj39+ +vGqFG2+SjS+u9ng1/w/0sAyc0tt7U0UkBQ5Ry1+qDM6+BvKiN1C/4XlZUj7NnklU +qNiaXllOsaPCvLLVmgQxtoXN6lOhc8FCRXZjF3SQYHNYhTUmHsd/na83GXObYeJ1 +4zcOe+7dteuX14srov+xLz1cpWUnop/6SbskxKbqK+s12uHF8jNOzSS5GxHsnIza +sWgYRML2aVan3f3Jd3+vOKOwC6Au5IlbtSP7wUY8/NNPoQ8pqBnhCnsCvowzQk3Q +FwNfmm+7Z+tqfT2ht96zXa27PWHYpSjmX4Qt6XEO4pECgYEA/bf9o5noUKP9ayTG +5BbOgtiw/oKYr6/frhbhnAyaZs98buvoZfz+D5cexbDEIDJ8pzBReWF01xIpHkrn +eiHShCvQLfu/lXGEQEF5dzjS4ApsZaLLIHN9r9d5/7z9dcoXe6oUf9wLcAc/tKT0 +7gf09zqqVYm5h+ekw8nB8m5ts2sCgYEA09ByyYtMSzTQAsJG4ZfL99Btpoi//XAG +r4oZHiF54wE8Pn5X1vQfT1Ih3IozD8uoSLLjciGjwnFdgD57Vqjl/eW3/EO9G3xK +T9zp8nxv9CEvfznT92N45ypsGGbhmdxYaZcSmXr1iINv9XemlK9lnC6dO7GTCbpp +0A2+PVAXzSkCgYAIwsywVIUwG6mJhJiVkbAJ1p+t+iZ5kpIfucyKjeja+fkq/1xk +AStosGgwnVz4W6XwQ/vcPCBDuO3QjPeXQQm65KRoohPIfkX5zgj6s+ycLd/2Vnu7 +ICHL653b1dPOuG69J29Txu5iLO3nN/b5LS8pRk5Ra9MLPVV0KUhYLbX+BwKBgAJz +KMC4Abvk8nr1sEgvr0ZAfOQuNLpDr3AcUsoMbRJ5Ey9N2so7rJkIRCf+2TRXkKy2 +lPbe+Lvo/8HZ9yc7cN2M6KHcTrWgrGNcFMCfO9RBBgGcs5zq450Y2oM1vWpAKC2g +d7CawXhAvOzD44NYu/4gc+Ua2q6EH3Eul4KyCHRxAoGBAK1pR07PFG+c40EtyXZ5 +mv84ogjJ1bj2bS/tA690x0Cy4i30wD00dUq5a4c0xnv+jGJ+ENMuHnvolPZ9qHM4 +DoXpHBJT1adVsyGDcfKRHBCPAIuaPbgMEKBZ5YHpEFv1BtrBYeMwTvV49htGtr0f +Q4YkBLL030hjGHKELzq18CWc -----END PRIVATE KEY----- diff --git a/manifests/tempest.pp b/manifests/tempest.pp index 5487080e0..2bf8c9021 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -193,74 +193,75 @@ class openstack_integration::tempest ( } class { '::tempest': - debug => true, - use_stderr => false, - log_file => 'tempest.log', - tempest_clone_owner => $::id, - git_clone => false, - tempest_clone_path => '/tmp/openstack/tempest', - lock_path => '/tmp/openstack/tempest', - tempest_config_file => '/tmp/openstack/tempest/etc/tempest.conf', - configure_images => true, - configure_networks => true, - identity_uri_v3 => "${::openstack_integration::config::keystone_auth_uri}/v3", - admin_username => 'admin', - admin_project_name => 'openstack', - admin_password => 'a_big_secret', - admin_domain_name => 'Default', - auth_version => 'v3', - tempest_roles => ['Member', 'creator'], # needed to use barbican. - image_name => 'cirros', - image_name_alt => 'cirros_alt', - cinder_available => $cinder, - cinder_backup_available => $cinder_backup, - designate_available => $designate, - glance_available => $glance, - glance_v1 => false, - glance_v2 => true, - keystone_v2 => false, - horizon_available => $horizon, - nova_available => $nova, - neutron_available => $neutron, - neutron_bgpvpn_available => $bgpvpn, - neutron_lbaas_available => true, - neutron_l2gw_available => $l2gw, - neutron_fwaas_available => true, - ceilometer_available => $ceilometer, - aodh_available => $aodh, - trove_available => $trove, - sahara_available => $sahara, - heat_available => $heat, - swift_available => $swift, - ironic_available => $ironic, - zaqar_available => $zaqar, - mistral_available => $mistral, - vitrage_available => $vitrage, - gnocchi_available => $gnocchi, - panko_available => $panko, - ec2api_available => $ec2api, - watcher_available => $watcher, - public_network_name => 'public', - neutron_api_extensions => join(any2array($neutron_api_extensions), ','), - dashboard_url => $::openstack_integration::config::base_url, - flavor_ref => '42', - flavor_ref_alt => '84', - db_flavor_ref => '42', - image_ssh_user => 'cirros', - image_alt_ssh_user => 'cirros', - img_file => 'cirros-0.4.0-x86_64-disk.img', - compute_build_interval => 10, - ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path, - manage_tests_packages => true, - attach_encrypted_volume => $attach_encrypted_volume, - murano_available => $murano, - tempest_workspace => '/tmp/openstack/tempest', - run_ssh => true, - l2gw_switch => $l2gw_switch, + debug => true, + use_stderr => false, + log_file => 'tempest.log', + tempest_clone_owner => $::id, + git_clone => false, + tempest_clone_path => '/tmp/openstack/tempest', + lock_path => '/tmp/openstack/tempest', + tempest_config_file => '/tmp/openstack/tempest/etc/tempest.conf', + configure_images => true, + configure_networks => true, + identity_uri_v3 => "${::openstack_integration::config::keystone_auth_uri}/v3", + admin_username => 'admin', + admin_project_name => 'openstack', + admin_password => 'a_big_secret', + admin_domain_name => 'Default', + auth_version => 'v3', + tempest_roles => ['Member', 'creator'], # needed to use barbican. + image_name => 'cirros', + image_name_alt => 'cirros_alt', + cinder_available => $cinder, + cinder_backup_available => $cinder_backup, + designate_available => $designate, + glance_available => $glance, + glance_v1 => false, + glance_v2 => true, + keystone_v2 => false, + horizon_available => $horizon, + nova_available => $nova, + neutron_available => $neutron, + neutron_bgpvpn_available => $bgpvpn, + neutron_lbaas_available => true, + neutron_l2gw_available => $l2gw, + neutron_fwaas_available => true, + ceilometer_available => $ceilometer, + aodh_available => $aodh, + trove_available => $trove, + sahara_available => $sahara, + heat_available => $heat, + swift_available => $swift, + ironic_available => $ironic, + zaqar_available => $zaqar, + mistral_available => $mistral, + vitrage_available => $vitrage, + gnocchi_available => $gnocchi, + panko_available => $panko, + ec2api_available => $ec2api, + watcher_available => $watcher, + public_network_name => 'public', + neutron_api_extensions => join(any2array($neutron_api_extensions), ','), + dashboard_url => $::openstack_integration::config::base_url, + flavor_ref => '42', + flavor_ref_alt => '84', + db_flavor_ref => '42', + image_ssh_user => 'cirros', + image_alt_ssh_user => 'cirros', + img_file => 'cirros-0.4.0-x86_64-disk.img', + compute_build_interval => 10, + ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path, + manage_tests_packages => true, + attach_encrypted_volume => $attach_encrypted_volume, + murano_available => $murano, + tempest_workspace => '/tmp/openstack/tempest', + run_ssh => true, + l2gw_switch => $l2gw_switch, + disable_dashboard_ssl_validation => true, # TODO(emilien) optimization by 1/ using Hiera to configure Glance image source # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image. # img_dir => '/home/jenkins/cache/files', - img_dir => '/tmp/openstack/image', + img_dir => '/tmp/openstack/image', } }