diff --git a/Dockerfile b/Dockerfile index 90becba..238d609 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,30 +117,66 @@ QUNUQ0V3QkFLcHhCMFNrR2RoR3FsT0tCZzAvS0c2RTdkaTVUL0IxS0JySEdjNldrR0FBQUFBRWxG\ VGtTdVFtQ0MiCiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vZG9jcy5hZXJvZ2Vhci5vcmcv\ ZXh0ZXJuYWwvYXBiL2tleWNsb2FrLmh0bWwiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBI\ YXQsIEluYy4iCiAgc2VydmljZU5hbWU6IGtleWNsb2FrCnBsYW5zOgogIC0gbmFtZTogZGVmYXVs\ -dAogICAgZGVzY3JpcHRpb246IERlcGxveSBrZXljbG9hawogICAgZnJlZTogVHJ1ZQogICAgbWV0\ -YWRhdGE6CiAgICAgIG1vYmlsZWNsaWVudF9iaW5kX3BhcmFtZXRlcnNfZGF0YToKICAgICAgICAt\ -ICd7Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVlIjogIm1ldGFkYXRhLm5hbWUiLCAidHlwZSI6\ -ICJwYXRoIn0nCiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVOVF9UWVBFIiwgInZhbHVlIjogInB1\ -YmxpYyIsICJ0eXBlIjogImRlZmF1bHQifScKICAgICAgc2VydmljZWluc3RhbmNlX2JpbmRfcGFy\ -YW1ldGVyc19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAi\ -bWV0YWRhdGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJ\ -RU5UX1RZUEUiLCAidmFsdWUiOiAiYmVhcmVyIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgcGFy\ -YW1ldGVyczoKICAgIC0gbmFtZTogQURNSU5fVVNFUk5BTUUKICAgICAgcmVxdWlyZWQ6IFRydWUK\ -ICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgdHlwZTogc3RyaW5nCiAgICAgIHRpdGxlOiBLZXlj\ -bG9hayBhZG1pbiB1c2VybmFtZQogICAgLSBuYW1lOiBBRE1JTl9QQVNTV09SRAogICAgICByZXF1\ -aXJlZDogVHJ1ZQogICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAg\ -dGl0bGU6IEtleWNsb2FrIGFkbWluIHBhc3N3b3JkCiAgICAtIG5hbWU6IENVU1RPTV9SRUFMTV9O\ -QU1FCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6\ -IE5hbWUgb2YgdGhlIEtleWNsb2FrIHJlYWxtIChkZWZhdWx0cyB0byBjdXJyZW50IG5hbWVzcGFj\ -ZSkKICAgIC0gbmFtZTogVVNFX1NIQVJFRF9TRVJWSUNFCiAgICAgIHJlcXVpcmVkOiBGYWxzZQog\ -ICAgICB0eXBlOiBib29sCiAgICAgIHRpdGxlOiBDb25uZWN0IHRvIGFuIGV4aXN0aW5nIHNoYXJl\ -ZCBzZXJ2aWNlCiAgICAtIG5hbWU6IFNIQVJFRF9IT1NUCiAgICAgIHJlcXVpcmVkOiBGYWxzZQog\ -ICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IFVSTCBvZiB0aGUgc2hhcmVkIHNlcnZpY2UK\ -ICAgIGJpbmRfcGFyYW1ldGVyczoKICAgIC0gbmFtZTogQ0xJRU5UX0lECiAgICAgIHJlcXVpcmVk\ -OiBUcnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgY2xpZW50IElEL1NlcnZpY2UgSUQKICAgICAgdHlw\ -ZTogc3RyaW5nCiAgICAtIG5hbWU6IENMSUVOVF9UWVBFCiAgICAgIHJlcXVpcmVkOiBUcnVlCiAg\ -ICAgIHRpdGxlOiBLZXljbG9hayBjbGllbnQgdHlwZQogICAgICB0eXBlOiBlbnVtCiAgICAgIGVu\ -dW06IFsnYmVhcmVyJywgJ3B1YmxpYyddCiAgICAgIGRlZmF1bHQ6IHB1YmxpYwo=" +dAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBzaG91bGQgYmUgdXNlZCBpbiBtb3N0IHVzZSBj\ +YXNlcwogICAgZnJlZTogVHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZWZh\ +dWx0CiAgICAgIG1vYmlsZWNsaWVudF9iaW5kX3BhcmFtZXRlcnNfZGF0YToKICAgICAgICAtICd7\ +Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVlIjogIm1ldGFkYXRhLm5hbWUiLCAidHlwZSI6ICJw\ +YXRoIn0nCiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVOVF9UWVBFIiwgInZhbHVlIjogInB1Ymxp\ +YyIsICJ0eXBlIjogImRlZmF1bHQifScKICAgICAgc2VydmljZWluc3RhbmNlX2JpbmRfcGFyYW1l\ +dGVyc19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAibWV0\ +YWRhdGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5U\ +X1RZUEUiLCAidmFsdWUiOiAiYmVhcmVyIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgcGFyYW1l\ +dGVyczoKICAgIC0gbmFtZTogQURNSU5fVVNFUk5BTUUKICAgICAgcmVxdWlyZWQ6IFRydWUKICAg\ +ICAgZGVmYXVsdDogYWRtaW4KICAgICAgdHlwZTogc3RyaW5nCiAgICAgIHRpdGxlOiBLZXljbG9h\ +ayBhZG1pbiB1c2VybmFtZQogICAgLSBuYW1lOiBBRE1JTl9QQVNTV09SRAogICAgICByZXF1aXJl\ +ZDogVHJ1ZQogICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0\ +bGU6IEtleWNsb2FrIGFkbWluIHBhc3N3b3JkCiAgICAtIG5hbWU6IENVU1RPTV9SRUFMTV9OQU1F\ +CiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IE5h\ +bWUgb2YgdGhlIEtleWNsb2FrIHJlYWxtIChkZWZhdWx0cyB0byBjdXJyZW50IG5hbWVzcGFjZSkK\ +ICAgIC0gbmFtZTogVVNFX1NIQVJFRF9TRVJWSUNFCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAg\ +ICB0eXBlOiBib29sCiAgICAgIHRpdGxlOiBDb25uZWN0IHRvIGFuIGV4aXN0aW5nIHNoYXJlZCBz\ +ZXJ2aWNlCiAgICAtIG5hbWU6IFNIQVJFRF9IT1NUCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAg\ +ICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IFVSTCBvZiB0aGUgc2hhcmVkIHNlcnZpY2UKICAg\ +IGJpbmRfcGFyYW1ldGVyczoKICAgIC0gbmFtZTogQ0xJRU5UX0lECiAgICAgIHJlcXVpcmVkOiBU\ +cnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgY2xpZW50IElEL1NlcnZpY2UgSUQKICAgICAgdHlwZTog\ +c3RyaW5nCiAgICAtIG5hbWU6IENMSUVOVF9UWVBFCiAgICAgIHJlcXVpcmVkOiBUcnVlCiAgICAg\ +IHRpdGxlOiBLZXljbG9hayBjbGllbnQgdHlwZQogICAgICB0eXBlOiBlbnVtCiAgICAgIGVudW06\ +IFsnYmVhcmVyJywgJ3B1YmxpYyddCiAgICAgIGRlZmF1bHQ6IHB1YmxpYwogIC0gbmFtZTogY3Vz\ +dG9tCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGNhbiBiZSB1c2VkIGlmIGltYWdlcyBuZWVk\ +IHRvIGJlIGN1c3RvbWl6ZWQKICAgIGZyZWU6IFRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNw\ +bGF5TmFtZTogVXNlciBTcGVjaWZpZWQKICAgICAgbW9iaWxlY2xpZW50X2JpbmRfcGFyYW1ldGVy\ +c19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAibWV0YWRh\ +dGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5UX1RZ\ +UEUiLCAidmFsdWUiOiAicHVibGljIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgICBzZXJ2aWNl\ +aW5zdGFuY2VfYmluZF9wYXJhbWV0ZXJzX2RhdGE6CiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVO\ +VF9JRCIsICJ2YWx1ZSI6ICJtZXRhZGF0YS5uYW1lIiwgInR5cGUiOiAicGF0aCJ9JwogICAgICAg\ +IC0gJ3sibmFtZSI6ICJDTElFTlRfVFlQRSIsICJ2YWx1ZSI6ICJiZWFyZXIiLCAidHlwZSI6ICJk\ +ZWZhdWx0In0nCiAgICBwYXJhbWV0ZXJzOgogICAgLSBuYW1lOiBjdXN0b21faWRtX2ltYWdlCiAg\ +ICAgIHRpdGxlOiBJZGVudGl0eSBtYW5hZ2VtZW50IGNvbnRhaW5lciBpbWFnZQogICAgICBkZXNj\ +cmlwdGlvbjogVGhlIGltYWdlIHRvIHVzZSBmb3IgdGhlIElkZW50aXR5IE1hbmFnZW1lbnQgc2Vy\ +dmljZSAoWW91IHNob3VsZG4ndCBuZWVkIHRvIGNoYW5nZSB0aGlzKQogICAgICBkZWZhdWx0OiBk\ +b2NrZXIuaW8vamJvc3Mva2V5Y2xvYWs6NC44LjMuRmluYWwKICAgICAgdHlwZTogc3RyaW5nCiAg\ +ICAgIHJlcXVpcmVkOiBUcnVlCiAgICAtIG5hbWU6IGN1c3RvbV9wb3N0Z3Jlc3FsX2ltYWdlCiAg\ +ICAgIHRpdGxlOiBQb3N0Z3JlU1FMIGNvbnRhaW5lciBpbWFnZQogICAgICBkZXNjcmlwdGlvbjog\ +VGhlIGltYWdlIHRvIHVzZSBmb3IgdGhlIFBvc3RncmVTUUwgZGF0YWJhc2UgKFlvdSBzaG91bGRu\ +J3QgbmVlZCB0byBjaGFuZ2UgdGhpcykKICAgICAgZGVmYXVsdDogZG9ja2VyLmlvL2NlbnRvcy9w\ +b3N0Z3Jlc3FsLTk2LWNlbnRvczc6OS42CiAgICAgIHR5cGU6IHN0cmluZwogICAgICByZXF1aXJl\ +ZDogVHJ1ZQogICAgLSBuYW1lOiBBRE1JTl9VU0VSTkFNRQogICAgICByZXF1aXJlZDogVHJ1ZQog\ +ICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IEtleWNs\ +b2FrIGFkbWluIHVzZXJuYW1lCiAgICAtIG5hbWU6IEFETUlOX1BBU1NXT1JECiAgICAgIHJlcXVp\ +cmVkOiBUcnVlCiAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgIHR5cGU6IHN0cmluZwogICAgICB0\ +aXRsZTogS2V5Y2xvYWsgYWRtaW4gcGFzc3dvcmQKICAgIC0gbmFtZTogQ1VTVE9NX1JFQUxNX05B\ +TUUKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAgICAgIHR5cGU6IHN0cmluZwogICAgICB0aXRsZTog\ +TmFtZSBvZiB0aGUgS2V5Y2xvYWsgcmVhbG0gKGRlZmF1bHRzIHRvIGN1cnJlbnQgbmFtZXNwYWNl\ +KQogICAgLSBuYW1lOiBVU0VfU0hBUkVEX1NFUlZJQ0UKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAg\ +ICAgIHR5cGU6IGJvb2wKICAgICAgdGl0bGU6IENvbm5lY3QgdG8gYW4gZXhpc3Rpbmcgc2hhcmVk\ +IHNlcnZpY2UKICAgIC0gbmFtZTogU0hBUkVEX0hPU1QKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAg\ +ICAgIHR5cGU6IHN0cmluZwogICAgICB0aXRsZTogVVJMIG9mIHRoZSBzaGFyZWQgc2VydmljZQog\ +ICAgYmluZF9wYXJhbWV0ZXJzOgogICAgLSBuYW1lOiBDTElFTlRfSUQKICAgICAgcmVxdWlyZWQ6\ +IFRydWUKICAgICAgdGl0bGU6IE1vYmlsZSBjbGllbnQgSUQvU2VydmljZSBJRAogICAgICB0eXBl\ +OiBzdHJpbmcKICAgIC0gbmFtZTogQ0xJRU5UX1RZUEUKICAgICAgcmVxdWlyZWQ6IFRydWUKICAg\ +ICAgdGl0bGU6IEtleWNsb2FrIGNsaWVudCB0eXBlCiAgICAgIHR5cGU6IGVudW0KICAgICAgZW51\ +bTogWydiZWFyZXInLCAncHVibGljJ10KICAgICAgZGVmYXVsdDogcHVibGlj" COPY playbooks /opt/apb/project COPY playbooks /opt/apb/actions diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 11f3c13..70fed10 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -117,30 +117,66 @@ QUNUQ0V3QkFLcHhCMFNrR2RoR3FsT0tCZzAvS0c2RTdkaTVUL0IxS0JySEdjNldrR0FBQUFBRWxG\ VGtTdVFtQ0MiCiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vZG9jcy5hZXJvZ2Vhci5vcmcv\ ZXh0ZXJuYWwvYXBiL2tleWNsb2FrLmh0bWwiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBI\ YXQsIEluYy4iCiAgc2VydmljZU5hbWU6IGtleWNsb2FrCnBsYW5zOgogIC0gbmFtZTogZGVmYXVs\ -dAogICAgZGVzY3JpcHRpb246IERlcGxveSBrZXljbG9hawogICAgZnJlZTogVHJ1ZQogICAgbWV0\ -YWRhdGE6CiAgICAgIG1vYmlsZWNsaWVudF9iaW5kX3BhcmFtZXRlcnNfZGF0YToKICAgICAgICAt\ -ICd7Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVlIjogIm1ldGFkYXRhLm5hbWUiLCAidHlwZSI6\ -ICJwYXRoIn0nCiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVOVF9UWVBFIiwgInZhbHVlIjogInB1\ -YmxpYyIsICJ0eXBlIjogImRlZmF1bHQifScKICAgICAgc2VydmljZWluc3RhbmNlX2JpbmRfcGFy\ -YW1ldGVyc19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAi\ -bWV0YWRhdGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJ\ -RU5UX1RZUEUiLCAidmFsdWUiOiAiYmVhcmVyIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgcGFy\ -YW1ldGVyczoKICAgIC0gbmFtZTogQURNSU5fVVNFUk5BTUUKICAgICAgcmVxdWlyZWQ6IFRydWUK\ -ICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgdHlwZTogc3RyaW5nCiAgICAgIHRpdGxlOiBLZXlj\ -bG9hayBhZG1pbiB1c2VybmFtZQogICAgLSBuYW1lOiBBRE1JTl9QQVNTV09SRAogICAgICByZXF1\ -aXJlZDogVHJ1ZQogICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAg\ -dGl0bGU6IEtleWNsb2FrIGFkbWluIHBhc3N3b3JkCiAgICAtIG5hbWU6IENVU1RPTV9SRUFMTV9O\ -QU1FCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6\ -IE5hbWUgb2YgdGhlIEtleWNsb2FrIHJlYWxtIChkZWZhdWx0cyB0byBjdXJyZW50IG5hbWVzcGFj\ -ZSkKICAgIC0gbmFtZTogVVNFX1NIQVJFRF9TRVJWSUNFCiAgICAgIHJlcXVpcmVkOiBGYWxzZQog\ -ICAgICB0eXBlOiBib29sCiAgICAgIHRpdGxlOiBDb25uZWN0IHRvIGFuIGV4aXN0aW5nIHNoYXJl\ -ZCBzZXJ2aWNlCiAgICAtIG5hbWU6IFNIQVJFRF9IT1NUCiAgICAgIHJlcXVpcmVkOiBGYWxzZQog\ -ICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IFVSTCBvZiB0aGUgc2hhcmVkIHNlcnZpY2UK\ -ICAgIGJpbmRfcGFyYW1ldGVyczoKICAgIC0gbmFtZTogQ0xJRU5UX0lECiAgICAgIHJlcXVpcmVk\ -OiBUcnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgY2xpZW50IElEL1NlcnZpY2UgSUQKICAgICAgdHlw\ -ZTogc3RyaW5nCiAgICAtIG5hbWU6IENMSUVOVF9UWVBFCiAgICAgIHJlcXVpcmVkOiBUcnVlCiAg\ -ICAgIHRpdGxlOiBLZXljbG9hayBjbGllbnQgdHlwZQogICAgICB0eXBlOiBlbnVtCiAgICAgIGVu\ -dW06IFsnYmVhcmVyJywgJ3B1YmxpYyddCiAgICAgIGRlZmF1bHQ6IHB1YmxpYwo=" \ +dAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBzaG91bGQgYmUgdXNlZCBpbiBtb3N0IHVzZSBj\ +YXNlcwogICAgZnJlZTogVHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZWZh\ +dWx0CiAgICAgIG1vYmlsZWNsaWVudF9iaW5kX3BhcmFtZXRlcnNfZGF0YToKICAgICAgICAtICd7\ +Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVlIjogIm1ldGFkYXRhLm5hbWUiLCAidHlwZSI6ICJw\ +YXRoIn0nCiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVOVF9UWVBFIiwgInZhbHVlIjogInB1Ymxp\ +YyIsICJ0eXBlIjogImRlZmF1bHQifScKICAgICAgc2VydmljZWluc3RhbmNlX2JpbmRfcGFyYW1l\ +dGVyc19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAibWV0\ +YWRhdGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5U\ +X1RZUEUiLCAidmFsdWUiOiAiYmVhcmVyIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgcGFyYW1l\ +dGVyczoKICAgIC0gbmFtZTogQURNSU5fVVNFUk5BTUUKICAgICAgcmVxdWlyZWQ6IFRydWUKICAg\ +ICAgZGVmYXVsdDogYWRtaW4KICAgICAgdHlwZTogc3RyaW5nCiAgICAgIHRpdGxlOiBLZXljbG9h\ +ayBhZG1pbiB1c2VybmFtZQogICAgLSBuYW1lOiBBRE1JTl9QQVNTV09SRAogICAgICByZXF1aXJl\ +ZDogVHJ1ZQogICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0\ +bGU6IEtleWNsb2FrIGFkbWluIHBhc3N3b3JkCiAgICAtIG5hbWU6IENVU1RPTV9SRUFMTV9OQU1F\ +CiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IE5h\ +bWUgb2YgdGhlIEtleWNsb2FrIHJlYWxtIChkZWZhdWx0cyB0byBjdXJyZW50IG5hbWVzcGFjZSkK\ +ICAgIC0gbmFtZTogVVNFX1NIQVJFRF9TRVJWSUNFCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAg\ +ICB0eXBlOiBib29sCiAgICAgIHRpdGxlOiBDb25uZWN0IHRvIGFuIGV4aXN0aW5nIHNoYXJlZCBz\ +ZXJ2aWNlCiAgICAtIG5hbWU6IFNIQVJFRF9IT1NUCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAg\ +ICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IFVSTCBvZiB0aGUgc2hhcmVkIHNlcnZpY2UKICAg\ +IGJpbmRfcGFyYW1ldGVyczoKICAgIC0gbmFtZTogQ0xJRU5UX0lECiAgICAgIHJlcXVpcmVkOiBU\ +cnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgY2xpZW50IElEL1NlcnZpY2UgSUQKICAgICAgdHlwZTog\ +c3RyaW5nCiAgICAtIG5hbWU6IENMSUVOVF9UWVBFCiAgICAgIHJlcXVpcmVkOiBUcnVlCiAgICAg\ +IHRpdGxlOiBLZXljbG9hayBjbGllbnQgdHlwZQogICAgICB0eXBlOiBlbnVtCiAgICAgIGVudW06\ +IFsnYmVhcmVyJywgJ3B1YmxpYyddCiAgICAgIGRlZmF1bHQ6IHB1YmxpYwogIC0gbmFtZTogY3Vz\ +dG9tCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGNhbiBiZSB1c2VkIGlmIGltYWdlcyBuZWVk\ +IHRvIGJlIGN1c3RvbWl6ZWQKICAgIGZyZWU6IFRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNw\ +bGF5TmFtZTogVXNlciBTcGVjaWZpZWQKICAgICAgbW9iaWxlY2xpZW50X2JpbmRfcGFyYW1ldGVy\ +c19kYXRhOgogICAgICAgIC0gJ3sibmFtZSI6ICJDTElFTlRfSUQiLCAidmFsdWUiOiAibWV0YWRh\ +dGEubmFtZSIsICJ0eXBlIjogInBhdGgifScKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5UX1RZ\ +UEUiLCAidmFsdWUiOiAicHVibGljIiwgInR5cGUiOiAiZGVmYXVsdCJ9JwogICAgICBzZXJ2aWNl\ +aW5zdGFuY2VfYmluZF9wYXJhbWV0ZXJzX2RhdGE6CiAgICAgICAgLSAneyJuYW1lIjogIkNMSUVO\ +VF9JRCIsICJ2YWx1ZSI6ICJtZXRhZGF0YS5uYW1lIiwgInR5cGUiOiAicGF0aCJ9JwogICAgICAg\ +IC0gJ3sibmFtZSI6ICJDTElFTlRfVFlQRSIsICJ2YWx1ZSI6ICJiZWFyZXIiLCAidHlwZSI6ICJk\ +ZWZhdWx0In0nCiAgICBwYXJhbWV0ZXJzOgogICAgLSBuYW1lOiBjdXN0b21faWRtX2ltYWdlCiAg\ +ICAgIHRpdGxlOiBJZGVudGl0eSBtYW5hZ2VtZW50IGNvbnRhaW5lciBpbWFnZQogICAgICBkZXNj\ +cmlwdGlvbjogVGhlIGltYWdlIHRvIHVzZSBmb3IgdGhlIElkZW50aXR5IE1hbmFnZW1lbnQgc2Vy\ +dmljZSAoWW91IHNob3VsZG4ndCBuZWVkIHRvIGNoYW5nZSB0aGlzKQogICAgICBkZWZhdWx0OiBk\ +b2NrZXIuaW8vamJvc3Mva2V5Y2xvYWs6NC44LjMuRmluYWwKICAgICAgdHlwZTogc3RyaW5nCiAg\ +ICAgIHJlcXVpcmVkOiBUcnVlCiAgICAtIG5hbWU6IGN1c3RvbV9wb3N0Z3Jlc3FsX2ltYWdlCiAg\ +ICAgIHRpdGxlOiBQb3N0Z3JlU1FMIGNvbnRhaW5lciBpbWFnZQogICAgICBkZXNjcmlwdGlvbjog\ +VGhlIGltYWdlIHRvIHVzZSBmb3IgdGhlIFBvc3RncmVTUUwgZGF0YWJhc2UgKFlvdSBzaG91bGRu\ +J3QgbmVlZCB0byBjaGFuZ2UgdGhpcykKICAgICAgZGVmYXVsdDogZG9ja2VyLmlvL2NlbnRvcy9w\ +b3N0Z3Jlc3FsLTk2LWNlbnRvczc6OS42CiAgICAgIHR5cGU6IHN0cmluZwogICAgICByZXF1aXJl\ +ZDogVHJ1ZQogICAgLSBuYW1lOiBBRE1JTl9VU0VSTkFNRQogICAgICByZXF1aXJlZDogVHJ1ZQog\ +ICAgICBkZWZhdWx0OiBhZG1pbgogICAgICB0eXBlOiBzdHJpbmcKICAgICAgdGl0bGU6IEtleWNs\ +b2FrIGFkbWluIHVzZXJuYW1lCiAgICAtIG5hbWU6IEFETUlOX1BBU1NXT1JECiAgICAgIHJlcXVp\ +cmVkOiBUcnVlCiAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgIHR5cGU6IHN0cmluZwogICAgICB0\ +aXRsZTogS2V5Y2xvYWsgYWRtaW4gcGFzc3dvcmQKICAgIC0gbmFtZTogQ1VTVE9NX1JFQUxNX05B\ +TUUKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAgICAgIHR5cGU6IHN0cmluZwogICAgICB0aXRsZTog\ +TmFtZSBvZiB0aGUgS2V5Y2xvYWsgcmVhbG0gKGRlZmF1bHRzIHRvIGN1cnJlbnQgbmFtZXNwYWNl\ +KQogICAgLSBuYW1lOiBVU0VfU0hBUkVEX1NFUlZJQ0UKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAg\ +ICAgIHR5cGU6IGJvb2wKICAgICAgdGl0bGU6IENvbm5lY3QgdG8gYW4gZXhpc3Rpbmcgc2hhcmVk\ +IHNlcnZpY2UKICAgIC0gbmFtZTogU0hBUkVEX0hPU1QKICAgICAgcmVxdWlyZWQ6IEZhbHNlCiAg\ +ICAgIHR5cGU6IHN0cmluZwogICAgICB0aXRsZTogVVJMIG9mIHRoZSBzaGFyZWQgc2VydmljZQog\ +ICAgYmluZF9wYXJhbWV0ZXJzOgogICAgLSBuYW1lOiBDTElFTlRfSUQKICAgICAgcmVxdWlyZWQ6\ +IFRydWUKICAgICAgdGl0bGU6IE1vYmlsZSBjbGllbnQgSUQvU2VydmljZSBJRAogICAgICB0eXBl\ +OiBzdHJpbmcKICAgIC0gbmFtZTogQ0xJRU5UX1RZUEUKICAgICAgcmVxdWlyZWQ6IFRydWUKICAg\ +ICAgdGl0bGU6IEtleWNsb2FrIGNsaWVudCB0eXBlCiAgICAgIHR5cGU6IGVudW0KICAgICAgZW51\ +bTogWydiZWFyZXInLCAncHVibGljJ10KICAgICAgZGVmYXVsdDogcHVibGlj" \ name="mobile-1-tech-preview/mobile-identity-management-apb" \ io.k8s.display-name="Mobile Identity Management APB" \ io.k8s.description="An APB that deploys Keycloak/RH-SSO on OpenShift through the service catalog, and provides a binding action for mobile use cases" \ diff --git a/apb.yml b/apb.yml index 5b5244c..40d7aaa 100644 --- a/apb.yml +++ b/apb.yml @@ -14,9 +14,10 @@ metadata: serviceName: keycloak plans: - name: default - description: Deploy keycloak + description: This plan should be used in most use cases free: True metadata: + displayName: Default mobileclient_bind_parameters_data: - '{"name": "CLIENT_ID", "value": "metadata.name", "type": "path"}' - '{"name": "CLIENT_TYPE", "value": "public", "type": "default"}' @@ -57,3 +58,60 @@ plans: type: enum enum: ['bearer', 'public'] default: public + - name: custom + description: This plan can be used if images need to be customized + free: True + metadata: + displayName: User Specified + mobileclient_bind_parameters_data: + - '{"name": "CLIENT_ID", "value": "metadata.name", "type": "path"}' + - '{"name": "CLIENT_TYPE", "value": "public", "type": "default"}' + serviceinstance_bind_parameters_data: + - '{"name": "CLIENT_ID", "value": "metadata.name", "type": "path"}' + - '{"name": "CLIENT_TYPE", "value": "bearer", "type": "default"}' + parameters: + - name: custom_idm_image + title: Identity management container image + description: The image to use for the Identity Management service (You shouldn't need to change this) + default: docker.io/jboss/keycloak:4.8.3.Final + type: string + required: True + - name: custom_postgresql_image + title: PostgreSQL container image + description: The image to use for the PostgreSQL database (You shouldn't need to change this) + default: docker.io/centos/postgresql-96-centos7:9.6 + type: string + required: True + - name: ADMIN_USERNAME + required: True + default: admin + type: string + title: Keycloak admin username + - name: ADMIN_PASSWORD + required: True + default: admin + type: string + title: Keycloak admin password + - name: CUSTOM_REALM_NAME + required: False + type: string + title: Name of the Keycloak realm (defaults to current namespace) + - name: USE_SHARED_SERVICE + required: False + type: bool + title: Connect to an existing shared service + - name: SHARED_HOST + required: False + type: string + title: URL of the shared service + bind_parameters: + - name: CLIENT_ID + required: True + title: Mobile client ID/Service ID + type: string + - name: CLIENT_TYPE + required: True + title: Keycloak client type + type: enum + enum: ['bearer', 'public'] + default: public \ No newline at end of file diff --git a/roles/provision-keycloak-apb/defaults/main.yml b/roles/provision-keycloak-apb/defaults/main.yml index 8a51062..853c0d8 100644 --- a/roles/provision-keycloak-apb/defaults/main.yml +++ b/roles/provision-keycloak-apb/defaults/main.yml @@ -1,11 +1,11 @@ --- playbook_debug: false -keycloak_image: docker.io/jboss/keycloak -keycloak_image_tag: 4.8.3.Final +default_keycloak_image: docker.io/jboss/keycloak:4.8.3.Final +keycloak_image: '{{ custom_idm_image | default(default_keycloak_image, true) }}' -postgres_image: docker.io/centos/postgresql-96-centos7 -postgres_image_tag: '9.6' +default_postgres_image: docker.io/centos/postgresql-96-centos7:9.6 +postgres_image: '{{ custom_postgresql_image | default(default_postgres_image, true) }}' postgres_database_name: keycloak # Keycloak dashboard config diff --git a/roles/provision-keycloak-apb/tasks/provision-keycloak.yml b/roles/provision-keycloak-apb/tasks/provision-keycloak.yml index 0ee1117..8231744 100644 --- a/roles/provision-keycloak-apb/tasks/provision-keycloak.yml +++ b/roles/provision-keycloak-apb/tasks/provision-keycloak.yml @@ -51,7 +51,7 @@ secret_key_ref: name: '{{ postgres_secret_name }}' key: database-name - image: '{{keycloak_image }}:{{ keycloak_image_tag }}' + image: '{{ keycloak_image }}' name: '{{ keycloak_service_name }}' ports: - container_port: 8080 diff --git a/roles/provision-keycloak-apb/tasks/provision-postgres.yml b/roles/provision-keycloak-apb/tasks/provision-postgres.yml index 604c2ef..ef36091 100644 --- a/roles/provision-keycloak-apb/tasks/provision-postgres.yml +++ b/roles/provision-keycloak-apb/tasks/provision-postgres.yml @@ -55,7 +55,7 @@ name: '{{ postgres_service_name }}' containers: - name: postgresql - image: '{{ postgres_image }}:{{ postgres_image_tag }}' + image: '{{ postgres_image }}' ports: - container_port: 5432 protocol: TCP