diff --git a/Dockerfile-canary b/Dockerfile-canary index b814b82..7ee766f 100644 --- a/Dockerfile-canary +++ b/Dockerfile-canary @@ -2,41 +2,41 @@ FROM ansibleplaybookbundle/apb-base:canary MAINTAINER Ansible Playbook Bundle Community LABEL "com.redhat.apb.spec"=\ -"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBteXNx\ -bF9kYXRhYmFzZQogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3Jp\ -cHRpb246IE1hcmlhREIgZGVmYXVsdCBkYXRhYmFzZSBuYW1lCiAgICB0aXRsZTogTWFyaWFEQiBE\ -YXRhYmFzZSBuYW1lCiAgICBwYXR0ZXJuOiAiXlthLXpBLVowLTlfXSpbYS16QS1aX10rW2EtekEt\ -WjAtOV9dKiQiCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfcm9vdF9wYXNzd29y\ -ZAogICAgdHlwZTogc3RyaW5nCiAgICBkZXNjcmlwdGlvbjogQSByYW5kb20gYWxwaGFudW1lcmlj\ -IHN0cmluZyBpZiBsZWZ0IGJsYW5rCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICByZXF1\ -aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5\ -cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1thLXpBLVow\ -LTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURCIFVzZXIK\ -ICAtIG5hbWU6IG15c3FsX3Bhc3N3b3JkCiAgICB0eXBlOiBzdHJpbmcKICAgIGRlc2NyaXB0aW9u\ -OiBBIHJhbmRvbSBhbHBoYW51bWVyaWMgc3RyaW5nIGlmIGxlZnQgYmxhbmsKICAgIHJlcXVpcmVk\ -OiB0cnVlCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRiX3ZlcnNp\ -b24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywgJzEwLjAn\ -XQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVxdWlyZWQ6\ -IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlhZGItYXBi\ -CmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQph\ -c3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFkYXRhOgog\ -IGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlhZGIvZG9j\ -dW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxlIG1hcmlh\ -ZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhh\ -dC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVk\ -aGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5y\ -ZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAiTWFyaWFE\ -QiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFyaWFkYgog\ -IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\ -dgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5z\ -dGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVmYXVsdDog\ -dHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAogICAgICBj\ -b3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86CiAgICAg\ -IC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lz\ -IGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVudCBzdG9y\ -YWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IFByb2R1\ -Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAgICB1cGRh\ -dGVzX3RvOgogICAgICAtIGRldgo=" +"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ +YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ +cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ +IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ +ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ +cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ +ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ +LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ +IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ +Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ +cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ +ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ +LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ +ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ +aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ +OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ +YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ +aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ +bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ +c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ +Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ +YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ +ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ +YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ +bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ +aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ +ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ +CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ +bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ +IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ +ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ +ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ +ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" diff --git a/Dockerfile-latest b/Dockerfile-latest index cb32326..8c94c1c 100644 --- a/Dockerfile-latest +++ b/Dockerfile-latest @@ -2,39 +2,41 @@ FROM ansibleplaybookbundle/apb-base MAINTAINER Ansible Playbook Bundle Community LABEL "com.redhat.apb.spec"=\ -"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBteXNx\ -bF9kYXRhYmFzZQogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3Jp\ -cHRpb246IE1hcmlhREIgZGVmYXVsdCBkYXRhYmFzZSBuYW1lCiAgICB0aXRsZTogTWFyaWFEQiBE\ -YXRhYmFzZSBuYW1lCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfcm9vdF9wYXNz\ -d29yZAogICAgdHlwZTogc3RyaW5nCiAgICBkZXNjcmlwdGlvbjogQSByYW5kb20gYWxwaGFudW1l\ -cmljIHN0cmluZyBpZiBsZWZ0IGJsYW5rCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICBy\ -ZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAg\ -IHR5cGU6IHN0cmluZwogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ -IFVzZXIKICAtIG5hbWU6IG15c3FsX3Bhc3N3b3JkCiAgICB0eXBlOiBzdHJpbmcKICAgIGRlc2Ny\ -aXB0aW9uOiBBIHJhbmRvbSBhbHBoYW51bWVyaWMgc3RyaW5nIGlmIGxlZnQgYmxhbmsKICAgIHJl\ -cXVpcmVkOiB0cnVlCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRi\ -X3ZlcnNpb24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywg\ -JzEwLjAnXQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVx\ -dWlyZWQ6IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlh\ -ZGItYXBiCmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTog\ -dHJ1ZQphc3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFk\ -YXRhOgogIGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlh\ -ZGIvZG9jdW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxl\ -IG1hcmlhZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNz\ -LnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nl\ -c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ -Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAi\ -TWFyaWFEQiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFy\ -aWFkYgogIHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5h\ -bWU6IGRldgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlh\ -REIgaW5zdGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVm\ -YXVsdDogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAog\ -ICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86\ -CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBk\ -ZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVu\ -dCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6\ -IFByb2R1Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAg\ -ICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo=" +"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ +YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ +cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ +IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ +ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ +cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ +ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ +LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ +IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ +Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ +cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ +ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ +LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ +ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ +aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ +OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ +YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ +aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ +bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ +c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ +Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ +YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ +ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ +YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ +bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ +aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ +ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ +CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ +bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ +IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ +ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ +ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ +ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" diff --git a/Dockerfile-nightly b/Dockerfile-nightly index 3e1d7f8..1714ebb 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -2,39 +2,41 @@ FROM ansibleplaybookbundle/apb-base:nightly MAINTAINER Ansible Playbook Bundle Community LABEL "com.redhat.apb.spec"=\ -"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBteXNx\ -bF9kYXRhYmFzZQogICAgZGVmYXVsdDogYWRtaW4KICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3Jp\ -cHRpb246IE1hcmlhREIgZGVmYXVsdCBkYXRhYmFzZSBuYW1lCiAgICB0aXRsZTogTWFyaWFEQiBE\ -YXRhYmFzZSBuYW1lCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfcm9vdF9wYXNz\ -d29yZAogICAgdHlwZTogc3RyaW5nCiAgICBkZXNjcmlwdGlvbjogQSByYW5kb20gYWxwaGFudW1l\ -cmljIHN0cmluZyBpZiBsZWZ0IGJsYW5rCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICBy\ -ZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogbXlzcWxfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAg\ -IHR5cGU6IHN0cmluZwogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ -IFVzZXIKICAtIG5hbWU6IG15c3FsX3Bhc3N3b3JkCiAgICB0eXBlOiBzdHJpbmcKICAgIGRlc2Ny\ -aXB0aW9uOiBBIHJhbmRvbSBhbHBoYW51bWVyaWMgc3RyaW5nIGlmIGxlZnQgYmxhbmsKICAgIHJl\ -cXVpcmVkOiB0cnVlCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgLSBuYW1lOiBtYXJpYWRi\ -X3ZlcnNpb24KICAgIGRlZmF1bHQ6ICIxMC4yIgogICAgZW51bTogWycxMC4yJyAsICcxMC4xJywg\ -JzEwLjAnXQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IE1hcmlhREIgVmVyc2lvbgogICAgcmVx\ -dWlyZWQ6IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQoKdmVyc2lvbjogMS4wCm5hbWU6IG1hcmlh\ -ZGItYXBiCmRlc2NyaXB0aW9uOiBNYXJpYWRiIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTog\ -dHJ1ZQphc3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBtYXJpYWRiCm1ldGFk\ -YXRhOgogIGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL21hcmlhZGIuY29tL2tiL2VuL21hcmlh\ -ZGIvZG9jdW1lbnRhdGlvbi8iCiAgbG9uZ0Rlc2NyaXB0aW9uOiAiRGVwbG95cyBhIGJpbmRhYmxl\ -IG1hcmlhZGIgaW5zdGFuY2UiCiAgZGVwZW5kZW5jaWVzOgogICAgLSAncmVnaXN0cnkuYWNjZXNz\ -LnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDAtcmhlbDcnCiAgICAtICdyZWdpc3RyeS5hY2Nl\ -c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ -Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAyLXJoZWw3JwogIGRpc3BsYXlOYW1lOiAi\ -TWFyaWFEQiAoQVBCKSIKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tbWFy\ -aWFkYgogIHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5h\ -bWU6IGRldgogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBkZXBsb3lzIGEgc2luZ2xlIE1hcmlh\ -REIgaW5zdGFuY2Ugd2l0aCBlcGhlbWVyYWwgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgZGVm\ -YXVsdDogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBEZXZlbG9wbWVudAog\ -ICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMKICAgIHVwZGF0ZXNfdG86\ -CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IFRoaXMgcGxhbiBk\ -ZXBsb3lzIGEgc2luZ2xlIE1hcmlhREIgaW5zdGFuY2Ugd2l0aCAxMCBHaUIgb2YgcGVyc2lzdGVu\ -dCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6\ -IFByb2R1Y3Rpb24KICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6ICpfcGFyYW1zCiAg\ -ICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo=" +"LS0tCiMjIFNoYXJlZCBwYXJhbWV0ZXJzCl9wYXJhbXM6ICZfcGFyYW1zCiAgLSBuYW1lOiBtYXJp\ +YWRiX2RhdGFiYXNlCiAgICBkZWZhdWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICBkZXNj\ +cmlwdGlvbjogTWFyaWFEQiBkZWZhdWx0IGRhdGFiYXNlIG5hbWUKICAgIHRpdGxlOiBNYXJpYURC\ +IERhdGFiYXNlIG5hbWUKICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9dKlthLXpBLVpfXStbYS16\ +QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0cnVlCiAgLSBuYW1lOiBtYXJpYWRiX3Jvb3RfcGFz\ +c3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVzY3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVt\ +ZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAg\ +cmVxdWlyZWQ6IHRydWUKICAtIG5hbWU6IG1hcmlhZGJfdXNlcgogICAgZGVmYXVsdDogYWRtaW4K\ +ICAgIHR5cGU6IHN0cmluZwogICAgcGF0dGVybjogIl5bYS16QS1aMC05X10qW2EtekEtWl9dK1th\ +LXpBLVowLTlfXSokIgogICAgcmVxdWlyZWQ6IHRydWUKICAgIGRlc2NyaXB0aW9uOiBNYXJpYURC\ +IFVzZXIKICAtIG5hbWU6IG1hcmlhZGJfcGFzc3dvcmQKICAgIHR5cGU6IHN0cmluZwogICAgZGVz\ +Y3JpcHRpb246IEEgcmFuZG9tIGFscGhhbnVtZXJpYyBzdHJpbmcgaWYgbGVmdCBibGFuawogICAg\ +cmVxdWlyZWQ6IHRydWUKICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAtIG5hbWU6IG1hcmlh\ +ZGJfdmVyc2lvbgogICAgZGVmYXVsdDogIjEwLjIiCiAgICBlbnVtOiBbJzEwLjInICwgJzEwLjEn\ +LCAnMTAuMCddCiAgICB0eXBlOiBlbnVtCiAgICB0aXRsZTogTWFyaWFEQiBWZXJzaW9uCiAgICBy\ +ZXF1aXJlZDogdHJ1ZQogICAgdXBkYXRhYmxlOiB0cnVlCgp2ZXJzaW9uOiAxLjAKbmFtZTogbWFy\ +aWFkYi1hcGIKZGVzY3JpcHRpb246IE1hcmlhZGIgYXBiIGltcGxlbWVudGF0aW9uCmJpbmRhYmxl\ +OiB0cnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOgogIC0gZGF0YWJhc2UKICAtIG1hcmlhZGIKbWV0\ +YWRhdGE6CiAgZG9jdW1lbnRhdGlvblVybDogImh0dHBzOi8vbWFyaWFkYi5jb20va2IvZW4vbWFy\ +aWFkYi9kb2N1bWVudGF0aW9uLyIKICBsb25nRGVzY3JpcHRpb246ICJEZXBsb3lzIGEgYmluZGFi\ +bGUgbWFyaWFkYiBpbnN0YW5jZSIKICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nl\ +c3MucmVkaGF0LmNvbS9yaHNjbC9tYXJpYWRiLTEwMC1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFj\ +Y2Vzcy5yZWRoYXQuY29tL3Joc2NsL21hcmlhZGItMTAxLXJoZWw3JwogICAgLSAncmVnaXN0cnku\ +YWNjZXNzLnJlZGhhdC5jb20vcmhzY2wvbWFyaWFkYi0xMDItcmhlbDcnCiAgZGlzcGxheU5hbWU6\ +ICJNYXJpYURCIChBUEIpIgogIGNvbnNvbGUub3BlbnNoaWZ0LmlvL2ljb25DbGFzczogaWNvbi1t\ +YXJpYWRiCiAgcHJvdmlkZXJEaXNwbGF5TmFtZTogIlJlZCBIYXQsIEluYy4iCnBsYW5zOgogIC0g\ +bmFtZTogZGV2CiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFuIGRlcGxveXMgYSBzaW5nbGUgTWFy\ +aWFEQiBpbnN0YW5jZSB3aXRoIGVwaGVtZXJhbCBzdG9yYWdlCiAgICBmcmVlOiB0cnVlCiAgICBk\ +ZWZhdWx0OiB0cnVlCiAgICBtZXRhZGF0YToKICAgICAgZGlzcGxheU5hbWU6IERldmVsb3BtZW50\ +CiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3BhcmFtcwogICAgdXBkYXRlc190\ +bzoKICAgICAgLSBwcm9kCiAgLSBuYW1lOiBwcm9kCiAgICBkZXNjcmlwdGlvbjogVGhpcyBwbGFu\ +IGRlcGxveXMgYSBzaW5nbGUgTWFyaWFEQiBpbnN0YW5jZSB3aXRoIDEwIEdpQiBvZiBwZXJzaXN0\ +ZW50IHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\ +ZTogUHJvZHVjdGlvbgogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wYXJhbXMK\ +ICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gZGV2Cg==" diff --git a/README.md b/README.md index 51a4b46..32170bd 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ An apb for deploying [mariadb](https://www.mariadb.org/about/). `docker run --rm --net=host -v $HOME/.kube:/opt/apb/.kube:z -u $UID docker.io/ansibleplaybookbundle/mariadb-apb provision` ## Passing extra parameters -`docker run --env "OPENSHIFT_TARGET=https://$TARGET:8443" --env "OPENSHIFT_TOKEN=$TOKEN" ansibleplaybookbundle/mariadb-apb provision --extra-vars "namespace=$NAMESPACE" --extra-vars "mysql_database=''" --extra-vars "mysql_root_password=''" --extra-vars "mysql_user=root"` +`docker run --env "OPENSHIFT_TARGET=https://$TARGET:8443" --env "OPENSHIFT_TOKEN=$TOKEN" ansibleplaybookbundle/mariadb-apb provision --extra-vars "namespace=$NAMESPACE" --extra-vars "mariadb_database=''" --extra-vars "mariadb_root_password=''" --extra-vars "mariadb_user=root"` ## Tearing down the application diff --git a/apb.yml b/apb.yml index b967cb1..308ca1d 100644 --- a/apb.yml +++ b/apb.yml @@ -1,25 +1,25 @@ --- ## Shared parameters _params: &_params - - name: mysql_database + - name: mariadb_database default: admin type: string description: MariaDB default database name title: MariaDB Database name pattern: "^[a-zA-Z0-9_]*[a-zA-Z_]+[a-zA-Z0-9_]*$" required: true - - name: mysql_root_password + - name: mariadb_root_password type: string description: A random alphanumeric string if left blank display_type: password required: true - - name: mysql_user + - name: mariadb_user default: admin type: string pattern: "^[a-zA-Z0-9_]*[a-zA-Z_]+[a-zA-Z0-9_]*$" required: true description: MariaDB User - - name: mysql_password + - name: mariadb_password type: string description: A random alphanumeric string if left blank required: true diff --git a/roles/rhscl-mariadb-apb-openshift/defaults/main.yml b/roles/rhscl-mariadb-apb-openshift/defaults/main.yml index 2199da3..a53ad23 100644 --- a/roles/rhscl-mariadb-apb-openshift/defaults/main.yml +++ b/roles/rhscl-mariadb-apb-openshift/defaults/main.yml @@ -1,8 +1,8 @@ --- service_name: "{{ lookup('env','SERVICE_NAME') | default('rhscl-mariadb', true) }}" namespace: "{{ lookup('env','NAMESPACE') | default('rhscl-mariadb-apb', true) }}" -mysql_database: "{{ lookup('env','MYSQL_DATABASE') | default('', true) }}" -mysql_user: "{{ lookup('env','MYSQL_USER') | default('admin', true) }}" +mariadb_database: "{{ lookup('env','MARIADB_DATABASE') | default('', true) }}" +mariadb_user: "{{ lookup('env','MARIADB_USER') | default('admin', true) }}" volume_size: "{{ lookup('env','VOLUME_SIZE') | default('10Gi', true) }}" mariadb_version: "{{ lookup('env','MARIADB_VERSION') | default('10.0', true) }}" image: "registry.access.redhat.com/rhscl/mariadb-{{ mariadb_version | replace('.', '') }}-rhel7" diff --git a/roles/rhscl-mariadb-apb-openshift/tasks/dev.yml b/roles/rhscl-mariadb-apb-openshift/tasks/dev.yml index 04dbbf5..5d195e1 100644 --- a/roles/rhscl-mariadb-apb-openshift/tasks/dev.yml +++ b/roles/rhscl-mariadb-apb-openshift/tasks/dev.yml @@ -23,13 +23,13 @@ containers: - env: - name: MYSQL_ROOT_PASSWORD - value: '{{ mysql_root_password }}' + value: '{{ mariadb_root_password }}' - name: MYSQL_USER - value: '{{ mysql_user }}' + value: '{{ mariadb_user }}' - name: MYSQL_PASSWORD - value: '{{ mysql_password }}' + value: '{{ mariadb_password }}' - name: MYSQL_DATABASE - value: '{{ mysql_database }}' + value: '{{ mariadb_database }}' image: "{{ image }}" image_pull_policy: IfNotPresent name: "{{ service_name }}" diff --git a/roles/rhscl-mariadb-apb-openshift/tasks/main.yml b/roles/rhscl-mariadb-apb-openshift/tasks/main.yml index c0cb62a..44c0096 100644 --- a/roles/rhscl-mariadb-apb-openshift/tasks/main.yml +++ b/roles/rhscl-mariadb-apb-openshift/tasks/main.yml @@ -9,7 +9,7 @@ register: olddc - name: Backup source database - shell: oc exec -n {{ namespace }} {{ oldpod.stdout }} -- /bin/bash -c "mysqldump -h 127.0.0.1 -u {{ mysql_user }} -p{{ mysql_password }} {{ mysql_database }} > /tmp/db.dump" + shell: oc exec -n {{ namespace }} {{ oldpod.stdout }} -- /bin/bash -c "mysqldump -h 127.0.0.1 -u {{ mariadb_user }} -p{{ mariadb_password }} {{ mariadb_database }} > /tmp/db.dump" - name: Copy over db backup shell: oc cp -n {{ namespace }} {{ oldpod.stdout }}:/tmp/db.dump /tmp/db.dump @@ -54,7 +54,7 @@ shell: oc cp -n {{ namespace }} /tmp/db.dump {{ newpod.stdout }}:tmp/db.dump - name: Restore database - shell: oc exec -n {{ namespace }} {{ newpod.stdout }} -- /bin/bash -c "mysql -h 127.0.0.1 -u {{ mysql_user }} -p{{ mysql_password }} {{ mysql_database }} < /tmp/db.dump" + shell: oc exec -n {{ namespace }} {{ newpod.stdout }} -- /bin/bash -c "mysql -h 127.0.0.1 -u {{ mariadb_user }} -p{{ mariadb_password }} {{ mariadb_database }} < /tmp/db.dump" - name: Remove old dc openshift_v1_deployment_config: @@ -84,7 +84,7 @@ DB_TYPE: "mysql" DB_HOST: "{{ service_name }}" DB_PORT: "3306" - DB_USER: "{{ mysql_user }}" - DB_PASSWORD: "{{ mysql_password }}" - DB_NAME: "{{ mysql_database }}" + DB_USER: "{{ mariadb_user }}" + DB_PASSWORD: "{{ mariadb_password }}" + DB_NAME: "{{ mariadb_database }}" when: state == "present" diff --git a/roles/rhscl-mariadb-apb-openshift/tasks/prod.yml b/roles/rhscl-mariadb-apb-openshift/tasks/prod.yml index ec3a7ef..cab1da3 100644 --- a/roles/rhscl-mariadb-apb-openshift/tasks/prod.yml +++ b/roles/rhscl-mariadb-apb-openshift/tasks/prod.yml @@ -34,13 +34,13 @@ containers: - env: - name: MYSQL_ROOT_PASSWORD - value: '{{ mysql_root_password }}' + value: '{{ mariadb_root_password }}' - name: MYSQL_USER - value: '{{ mysql_user }}' + value: '{{ mariadb_user }}' - name: MYSQL_PASSWORD - value: '{{ mysql_password }}' + value: '{{ mariadb_password }}' - name: MYSQL_DATABASE - value: '{{ mysql_database }}' + value: '{{ mariadb_database }}' image: "{{ image }}" image_pull_policy: IfNotPresent name: "{{ service_name }}"