diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index d928039a8f..d177659a09 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -143,31 +143,31 @@ # Fedora Messaging - role: openshift/secret-file - app: badges - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: badges + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: badges - secret_name: fedora-messaging-crt - key: fedbadges-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/fedbadges{{env_suffix}}.crt" + secret_file_app: badges + secret_file_secret_name: fedora-messaging-crt + secret_file_key: fedbadges-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/fedbadges{{env_suffix}}.crt" - role: openshift/secret-file - app: badges - secret_name: fedora-messaging-key - key: fedbadges-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/fedbadges{{env_suffix}}.key" + secret_file_app: badges + secret_file_secret_name: fedora-messaging-key + secret_file_key: fedbadges-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/fedbadges{{env_suffix}}.key" - role: openshift/secret-file - app: badges - secret_name: tahrir-fedora-messaging-crt - key: tahrir-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/tahrir{{env_suffix}}.crt" + secret_file_app: badges + secret_file_secret_name: tahrir-fedora-messaging-crt + secret_file_key: tahrir-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/tahrir{{env_suffix}}.crt" - role: openshift/secret-file - app: badges - secret_name: tahrir-fedora-messaging-key - key: tahrir-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/tahrir{{env_suffix}}.key" + secret_file_app: badges + secret_file_secret_name: tahrir-fedora-messaging-key + secret_file_key: tahrir-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/tahrir{{env_suffix}}.key" # FASJSON access - role: openshift/ipa-client diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index d0393d1ce5..17f8a24dd0 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -80,20 +80,20 @@ keytab_service: bodhi keytab_host: "bodhi{{ env_suffix }}.fedoraproject.org" - role: openshift/secret-file - app: bodhi - secret_name: bodhi-fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: bodhi + secret_file_secret_name: bodhi-fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: bodhi - secret_name: bodhi-fedora-messaging-crt - key: bodhi-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/bodhi{{env_suffix}}.crt" + secret_file_app: bodhi + secret_file_secret_name: bodhi-fedora-messaging-crt + secret_file_key: bodhi-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/bodhi{{env_suffix}}.crt" - role: openshift/secret-file - app: bodhi - secret_name: bodhi-fedora-messaging-key - key: bodhi-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env_suffix}}.key" + secret_file_app: bodhi + secret_file_secret_name: bodhi-fedora-messaging-key + secret_file_key: bodhi-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env_suffix}}.key" - role: openshift/object object_app: bodhi object_template: imagestreams-tagged.yml diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index 0e40606d15..cce9e4413b 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -26,35 +26,35 @@ # Fedora Messaging secrets - role: openshift/secret-file - app: bugzilla2fedmsg - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: bugzilla2fedmsg + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: bugzilla2fedmsg - secret_name: fedora-messaging-crt - key: bugzilla2fedmsg-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/bugzilla2fedmsg{{env_suffix}}.crt" + secret_file_app: bugzilla2fedmsg + secret_file_secret_name: fedora-messaging-crt + secret_file_key: bugzilla2fedmsg-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/bugzilla2fedmsg{{env_suffix}}.crt" - role: openshift/secret-file - app: bugzilla2fedmsg - secret_name: fedora-messaging-key - key: bugzilla2fedmsg-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/bugzilla2fedmsg{{env_suffix}}.key" + secret_file_app: bugzilla2fedmsg + secret_file_secret_name: fedora-messaging-key + secret_file_key: bugzilla2fedmsg-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/bugzilla2fedmsg{{env_suffix}}.key" # STOMP secrets - role: openshift/secret-file - app: bugzilla2fedmsg - secret_name: stomp-crt - key: msg-client-fedora-prod.crt - privatefile: "bugzilla2fedmsg/msg-client-fedora-prod.crt" + secret_file_app: bugzilla2fedmsg + secret_file_secret_name: stomp-crt + secret_file_key: msg-client-fedora-prod.crt + secret_file_privatefile: "bugzilla2fedmsg/msg-client-fedora-prod.crt" - role: openshift/secret-file - app: bugzilla2fedmsg - secret_name: stomp-key - key: msg-client-fedora-prod.key - privatefile: "bugzilla2fedmsg/msg-client-fedora-prod.key" + secret_file_app: bugzilla2fedmsg + secret_file_secret_name: stomp-key + secret_file_key: msg-client-fedora-prod.key + secret_file_privatefile: "bugzilla2fedmsg/msg-client-fedora-prod.key" # FASJSON access - role: openshift/ipa-client diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml index 4d1936e06f..eeeb72ac42 100644 --- a/playbooks/openshift-apps/cloud-image-uploader.yml +++ b/playbooks/openshift-apps/cloud-image-uploader.yml @@ -77,34 +77,34 @@ - "westus3" - role: openshift/secret-file - app: cloud-image-uploader - secret_name: cloud-image-uploader-fedora-messaging-key - key: cloud-image-uploader.key - privatefile: "rabbitmq/{{env}}/pki/private/cloud-image-uploader{{env_suffix}}.key" + secret_file_app: cloud-image-uploader + secret_file_secret_name: cloud-image-uploader-fedora-messaging-key + secret_file_key: cloud-image-uploader.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/cloud-image-uploader{{env_suffix}}.key" - role: openshift/secret-file - app: cloud-image-uploader - secret_name: cloud-image-uploader-fedora-messaging-crt - key: cloud-image-uploader.crt - privatefile: "rabbitmq/{{env}}/pki/issued/cloud-image-uploader{{env_suffix}}.crt" + secret_file_app: cloud-image-uploader + secret_file_secret_name: cloud-image-uploader-fedora-messaging-crt + secret_file_key: cloud-image-uploader.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/cloud-image-uploader{{env_suffix}}.crt" - role: openshift/secret-file - app: cloud-image-uploader - secret_name: cloud-image-uploader-fedora-messaging-ca - key: cloud-image-uploader.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: cloud-image-uploader + secret_file_secret_name: cloud-image-uploader-fedora-messaging-ca + secret_file_key: cloud-image-uploader.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: cloud-image-uploader - secret_name: registry-fedoraproject-cert - key: registry-fedoraproject.cert - privatefile: "docker-registry/{{env}}/pki/issued/containerstable.crt" + secret_file_app: cloud-image-uploader + secret_file_secret_name: registry-fedoraproject-cert + secret_file_key: registry-fedoraproject.cert + secret_file_privatefile: "docker-registry/{{env}}/pki/issued/containerstable.crt" - role: openshift/secret-file - app: cloud-image-uploader - secret_name: registry-fedoraproject-key - key: registry-fedoraproject.key - privatefile: "docker-registry/{{env}}/pki/private/containerstable.key" + secret_file_app: cloud-image-uploader + secret_file_secret_name: registry-fedoraproject-key + secret_file_key: registry-fedoraproject.key + secret_file_privatefile: "docker-registry/{{env}}/pki/private/containerstable.key" - role: openshift/object object_app: cloud-image-uploader diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index 708f8d0b96..a552f0f6cc 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -54,20 +54,20 @@ # Fedora Messaging secrets - role: openshift/secret-file - app: coreos-ostree-importer - secret_name: fedora-messaging-ca - key: "{{ fedora_messaging_ca_file }}" - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: coreos-ostree-importer + secret_file_secret_name: fedora-messaging-ca + secret_file_key: "{{ fedora_messaging_ca_file }}" + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: coreos-ostree-importer - secret_name: fedora-messaging-crt - key: "{{ fedora_messaging_cert_file }}" - privatefile: "rabbitmq/{{env}}/pki/issued/coreos-ostree-importer{{env_suffix}}.crt" + secret_file_app: coreos-ostree-importer + secret_file_secret_name: fedora-messaging-crt + secret_file_key: "{{ fedora_messaging_cert_file }}" + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/coreos-ostree-importer{{env_suffix}}.crt" - role: openshift/secret-file - app: coreos-ostree-importer - secret_name: fedora-messaging-key - key: "{{ fedora_messaging_key_file }}" - privatefile: "rabbitmq/{{env}}/pki/private/coreos-ostree-importer{{env_suffix}}.key" + secret_file_app: coreos-ostree-importer + secret_file_secret_name: fedora-messaging-key + secret_file_key: "{{ fedora_messaging_key_file }}" + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/coreos-ostree-importer{{env_suffix}}.key" # Fedora Messaging config - role: openshift/object diff --git a/playbooks/openshift-apps/datanommer.yml b/playbooks/openshift-apps/datanommer.yml index cc6a1700d8..e96cd8d804 100644 --- a/playbooks/openshift-apps/datanommer.yml +++ b/playbooks/openshift-apps/datanommer.yml @@ -48,20 +48,20 @@ when: env == "staging" - role: openshift/secret-file - app: datanommer - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: datanommer + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: datanommer - secret_name: fedora-messaging-crt - key: datanommer-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/datanommer{{env_suffix}}.crt" + secret_file_app: datanommer + secret_file_secret_name: fedora-messaging-crt + secret_file_key: datanommer-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/datanommer{{env_suffix}}.crt" - role: openshift/secret-file - app: datanommer - secret_name: fedora-messaging-key - key: datanommer-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/datanommer{{env_suffix}}.key" + secret_file_app: datanommer + secret_file_secret_name: fedora-messaging-key + secret_file_key: datanommer-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/datanommer{{env_suffix}}.key" - role: openshift/object object_app: datanommer diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 589da071bb..d137e006ea 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -25,20 +25,20 @@ - apply-appowners - role: openshift/secret-file - app: discourse2fedmsg - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: discourse2fedmsg + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: discourse2fedmsg - secret_name: fedora-messaging-crt - key: discourse2fedmsg-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/discourse2fedmsg{{env_suffix}}.crt" + secret_file_app: discourse2fedmsg + secret_file_secret_name: fedora-messaging-crt + secret_file_key: discourse2fedmsg-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/discourse2fedmsg{{env_suffix}}.crt" - role: openshift/secret-file - app: discourse2fedmsg - secret_name: fedora-messaging-key - key: discourse2fedmsg-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/discourse2fedmsg{{env_suffix}}.key" + secret_file_app: discourse2fedmsg + secret_file_secret_name: fedora-messaging-key + secret_file_key: discourse2fedmsg-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/discourse2fedmsg{{env_suffix}}.key" - role: openshift/imagestream imagestream_app: discourse2fedmsg diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index a4afe5dab0..ab0eeda555 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -65,22 +65,22 @@ object_objectname: buildconfig.yml - role: openshift/secret-file - app: elections - secret_name: elections-fedora-messaging-key - key: elections.key - privatefile: "rabbitmq/{{env}}/pki/private/elections{{env_suffix}}.key" + secret_file_app: elections + secret_file_secret_name: elections-fedora-messaging-key + secret_file_key: elections.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/elections{{env_suffix}}.key" - role: openshift/secret-file - app: elections - secret_name: elections-fedora-messaging-crt - key: elections.crt - privatefile: "rabbitmq/{{env}}/pki/issued/elections{{env_suffix}}.crt" + secret_file_app: elections + secret_file_secret_name: elections-fedora-messaging-crt + secret_file_key: elections.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/elections{{env_suffix}}.crt" - role: openshift/secret-file - app: elections - secret_name: elections-fedora-messaging-ca - key: elections.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: elections + secret_file_secret_name: elections-fedora-messaging-ca + secret_file_key: elections.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: elections diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index 6a0915343e..f5bf5d630a 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -64,10 +64,10 @@ # Session secret key - role: openshift/secret-file - app: fasjson - secret_name: session-key - key: session.key - privatefile: "fasjson/session.{{env}}.key" + secret_file_app: fasjson + secret_file_secret_name: session-key + secret_file_key: session.key + secret_file_privatefile: "fasjson/session.{{env}}.key" - role: openshift/imagestream imagestream_app: fasjson diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index 151f0d1d43..71d42f86d8 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -31,22 +31,22 @@ object_objectname: buildconfig.yml - role: openshift/secret-file - app: fedocal - secret_name: fedocal-fedora-messaging-key - key: fedocal.key - privatefile: "rabbitmq/{{env}}/pki/private/fedocal{{env_suffix}}.key" + secret_file_app: fedocal + secret_file_secret_name: fedocal-fedora-messaging-key + secret_file_key: fedocal.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/fedocal{{env_suffix}}.key" - role: openshift/secret-file - app: fedocal - secret_name: fedocal-fedora-messaging-crt - key: fedocal.crt - privatefile: "rabbitmq/{{env}}/pki/issued/fedocal{{env_suffix}}.crt" + secret_file_app: fedocal + secret_file_secret_name: fedocal-fedora-messaging-crt + secret_file_key: fedocal.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/fedocal{{env_suffix}}.crt" - role: openshift/secret-file - app: fedocal - secret_name: fedocal-fedora-messaging-ca - key: fedocal.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: fedocal + secret_file_secret_name: fedocal-fedora-messaging-ca + secret_file_key: fedocal.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: fedocal diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index ae71536986..ee966f69c3 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -184,20 +184,20 @@ # Fedora Messaging - role: openshift/secret-file - app: fmn - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: fmn + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: fmn - secret_name: fedora-messaging-crt - key: fmn-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/fmn{{env_suffix}}.crt" + secret_file_app: fmn + secret_file_secret_name: fedora-messaging-crt + secret_file_key: fmn-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/fmn{{env_suffix}}.crt" - role: openshift/secret-file - app: fmn - secret_name: fedora-messaging-key - key: fmn-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/fmn{{env_suffix}}.key" + secret_file_app: fmn + secret_file_secret_name: fedora-messaging-key + secret_file_key: fmn-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/fmn{{env_suffix}}.key" # Deployment config - role: openshift/object diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index b51d3dddc6..fe454367fc 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -34,22 +34,22 @@ user_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.greenwave\..* - role: openshift/secret-file - app: greenwave - secret_name: greenwave-fedora-messaging-key - key: greenwave.key - privatefile: "rabbitmq/{{env}}/pki/private/greenwave{{env_suffix}}.key" + secret_file_app: greenwave + secret_file_secret_name: greenwave-fedora-messaging-key + secret_file_key: greenwave.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/greenwave{{env_suffix}}.key" - role: openshift/secret-file - app: greenwave - secret_name: greenwave-fedora-messaging-crt - key: greenwave.crt - privatefile: "rabbitmq/{{env}}/pki/issued/greenwave{{env_suffix}}.crt" + secret_file_app: greenwave + secret_file_secret_name: greenwave-fedora-messaging-crt + secret_file_key: greenwave.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/greenwave{{env_suffix}}.crt" - role: openshift/secret-file - app: greenwave - secret_name: greenwave-fedora-messaging-ca - key: greenwave.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: greenwave + secret_file_secret_name: greenwave-fedora-messaging-ca + secret_file_key: greenwave.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: greenwave diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index 110ade1205..ffb9b1a3ce 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/playbooks/openshift-apps/kerneltest.yml @@ -53,20 +53,20 @@ - apply-appowners - role: openshift/secret-file - app: kerneltest - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: kerneltest + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: kerneltest - secret_name: fedora-messaging-crt - key: kerneltest-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/kerneltest{{env_suffix}}.crt" + secret_file_app: kerneltest + secret_file_secret_name: fedora-messaging-crt + secret_file_key: kerneltest-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/kerneltest{{env_suffix}}.crt" - role: openshift/secret-file - app: kerneltest - secret_name: fedora-messaging-key - key: kerneltest-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/kerneltest{{env_suffix}}.key" + secret_file_app: kerneltest + secret_file_secret_name: fedora-messaging-key + secret_file_key: kerneltest-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/kerneltest{{env_suffix}}.key" - role: openshift/object object_app: kerneltest diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 9b27971b85..0394ac7f82 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/playbooks/openshift-apps/maubot.yml @@ -73,22 +73,22 @@ object_objectname: configmap.yml - role: openshift/secret-file - app: maubot - secret_name: maubot-fedora-messaging-key - key: maubot.key - privatefile: "rabbitmq/{{env}}/pki/private/maubot{{env_suffix}}.key" + secret_file_app: maubot + secret_file_secret_name: maubot-fedora-messaging-key + secret_file_key: maubot.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/maubot{{env_suffix}}.key" - role: openshift/secret-file - app: maubot - secret_name: maubot-fedora-messaging-crt - key: maubot.crt - privatefile: "rabbitmq/{{env}}/pki/issued/maubot{{env_suffix}}.crt" + secret_file_app: maubot + secret_file_secret_name: maubot-fedora-messaging-crt + secret_file_key: maubot.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/maubot{{env_suffix}}.crt" - role: openshift/secret-file - app: maubot - secret_name: maubot-fedora-messaging-ca - key: maubot.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: maubot + secret_file_secret_name: maubot-fedora-messaging-ca + secret_file_key: maubot.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/start-build app: maubot diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index 10ac28872c..cf0a029dd4 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -42,22 +42,22 @@ object_objectname: configmap.yml - role: openshift/secret-file - app: mdapi - secret_name: mdapi-fedora-messaging-key - key: mdapi.key - privatefile: "rabbitmq/{{env}}/pki/private/mdapi{{env_suffix}}.key" + secret_file_app: mdapi + secret_file_secret_name: mdapi-fedora-messaging-key + secret_file_key: mdapi.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/mdapi{{env_suffix}}.key" - role: openshift/secret-file - app: mdapi - secret_name: mdapi-fedora-messaging-crt - key: mdapi.crt - privatefile: "rabbitmq/{{env}}/pki/issued/mdapi{{env_suffix}}.crt" + secret_file_app: mdapi + secret_file_secret_name: mdapi-fedora-messaging-crt + secret_file_key: mdapi.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/mdapi{{env_suffix}}.crt" - role: openshift/secret-file - app: mdapi - secret_name: mdapi-fedora-messaging-ca - key: mdapi.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: mdapi + secret_file_secret_name: mdapi-fedora-messaging-ca + secret_file_key: mdapi.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: mdapi diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index aee3b8ad3f..bfa85e0b73 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -96,31 +96,31 @@ - appowners - role: openshift/secret-file - app: messaging-bridges - secret_name: fedmsg-key - key: fedmsg-fedmsg-migration-tools.key - privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.key" + secret_file_app: messaging-bridges + secret_file_secret_name: fedmsg-key + secret_file_key: fedmsg-fedmsg-migration-tools.key + secret_file_privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.key" - role: openshift/secret-file - app: messaging-bridges - secret_name: fedmsg-cert - key: fedmsg-fedmsg-migration-tools.crt - privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.crt" + secret_file_app: messaging-bridges + secret_file_secret_name: fedmsg-cert + secret_file_key: fedmsg-fedmsg-migration-tools.crt + secret_file_privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.crt" - role: openshift/secret-file - app: messaging-bridges - secret_name: rabbitmq-ca - key: rabbitmq-ca.crt - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: messaging-bridges + secret_file_secret_name: rabbitmq-ca + secret_file_key: rabbitmq-ca.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: messaging-bridges - secret_name: rabbitmq-key - key: rabbitmq-fedmsg-migration-tools.key - privatefile: "rabbitmq/{{env}}/pki/private/messaging-bridge{{env_suffix}}.fedoraproject.org.key" + secret_file_app: messaging-bridges + secret_file_secret_name: rabbitmq-key + secret_file_key: rabbitmq-fedmsg-migration-tools.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/messaging-bridge{{env_suffix}}.fedoraproject.org.key" - role: openshift/secret-file - app: messaging-bridges - secret_name: rabbitmq-cert - key: rabbitmq-fedmsg-migration-tools.crt - privatefile: "rabbitmq/{{env}}/pki/issued/messaging-bridge{{env_suffix}}.fedoraproject.org.crt" + secret_file_app: messaging-bridges + secret_file_secret_name: rabbitmq-cert + secret_file_key: rabbitmq-fedmsg-migration-tools.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/messaging-bridge{{env_suffix}}.fedoraproject.org.crt" - role: openshift/object object_app: messaging-bridges diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index e3f27b86c6..c3cf906740 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -108,27 +108,27 @@ # SSH key to get the access logs - role: openshift/secret-file - app: mirrormanager - secret_name: ssh-mirrorlist-proxies-key - key: ssh_mirrorlist_proxies.key - privatefile: "mirrormanager/id_rsa" + secret_file_app: mirrormanager + secret_file_secret_name: ssh-mirrorlist-proxies-key + secret_file_key: ssh_mirrorlist_proxies.key + secret_file_privatefile: "mirrormanager/id_rsa" # Fedora Messaging - role: openshift/secret-file - app: mirrormanager - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: mirrormanager + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: mirrormanager - secret_name: fedora-messaging-crt - key: cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/mirrormanager{{env_suffix}}.crt" + secret_file_app: mirrormanager + secret_file_secret_name: fedora-messaging-crt + secret_file_key: cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/mirrormanager{{env_suffix}}.crt" - role: openshift/secret-file - app: mirrormanager - secret_name: fedora-messaging-key - key: key.pem - privatefile: "rabbitmq/{{env}}/pki/private/mirrormanager{{env_suffix}}.key" + secret_file_app: mirrormanager + secret_file_secret_name: fedora-messaging-key + secret_file_key: key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/mirrormanager{{env_suffix}}.key" # Deployment config - role: openshift/object diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml index a4d11c2b67..836e1e1a52 100644 --- a/playbooks/openshift-apps/monitor_gating.yml +++ b/playbooks/openshift-apps/monitor_gating.yml @@ -31,22 +31,22 @@ keytab_service: packagerbot - role: openshift/secret-file - app: monitor-gating - secret_name: monitor-gating-fedora-messaging-key - key: monitor-gating.key - privatefile: "rabbitmq/{{env}}/pki/private/monitor-gating{{env_suffix}}.key" + secret_file_app: monitor-gating + secret_file_secret_name: monitor-gating-fedora-messaging-key + secret_file_key: monitor-gating.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/monitor-gating{{env_suffix}}.key" - role: openshift/secret-file - app: monitor-gating - secret_name: monitor-gating-fedora-messaging-crt - key: monitor-gating.crt - privatefile: "rabbitmq/{{env}}/pki/issued/monitor-gating{{env_suffix}}.crt" + secret_file_app: monitor-gating + secret_file_secret_name: monitor-gating-fedora-messaging-crt + secret_file_key: monitor-gating.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/monitor-gating{{env_suffix}}.crt" - role: openshift/secret-file - app: monitor-gating - secret_name: monitor-gating-fedora-messaging-ca - key: monitor-gating.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: monitor-gating + secret_file_secret_name: monitor-gating-fedora-messaging-ca + secret_file_key: monitor-gating.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: monitor-gating @@ -69,10 +69,10 @@ object_objectname: configmap.yml - role: openshift/secret-file - app: monitor-gating - secret_name: monitor-gating-ssh - key: id_rsa - privatefile: "git-ssh/monitor_gating" + secret_file_app: monitor-gating + secret_file_secret_name: monitor-gating-ssh + secret_file_key: id_rsa + secret_file_privatefile: "git-ssh/monitor_gating" - role: openshift/object object_app: monitor-gating diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 1685d20fe1..9c82bb0d5f 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -38,20 +38,20 @@ when: env == "staging" - role: openshift/secret-file - app: noggin-centos - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: noggin-centos + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: noggin-centos - secret_name: fedora-messaging-crt - key: noggin-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/noggin{{env_suffix}}.crt" + secret_file_app: noggin-centos + secret_file_secret_name: fedora-messaging-crt + secret_file_key: noggin-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/noggin{{env_suffix}}.crt" - role: openshift/secret-file - app: noggin-centos - secret_name: fedora-messaging-key - key: noggin-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" + secret_file_app: noggin-centos + secret_file_secret_name: fedora-messaging-key + secret_file_key: noggin-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" - role: openshift/imagestream imagestream_app: noggin-centos diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index e3964eb7e6..ecf57789f1 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -38,20 +38,20 @@ when: env == "staging" - role: openshift/secret-file - app: noggin - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: noggin + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: noggin - secret_name: fedora-messaging-crt - key: noggin-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/noggin{{env_suffix}}.crt" + secret_file_app: noggin + secret_file_secret_name: fedora-messaging-crt + secret_file_key: noggin-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/noggin{{env_suffix}}.crt" - role: openshift/secret-file - app: noggin - secret_name: fedora-messaging-key - key: noggin-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" + secret_file_app: noggin + secret_file_secret_name: fedora-messaging-key + secret_file_key: noggin-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" - role: openshift/imagestream imagestream_app: noggin diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index f99d18d5e2..56f7b8e259 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -148,20 +148,20 @@ sent_topics: "{{ openscanhub_sent_topics }}" - role: openshift/secret-file - app: openscanhub - secret_name: openscanhub-fedora-messaging-ca - key: fedora-messaging-openscanhub-ca.crt - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: openscanhub + secret_file_secret_name: openscanhub-fedora-messaging-ca + secret_file_key: fedora-messaging-openscanhub-ca.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: openscanhub - secret_name: openscanhub-fedora-messaging-key - key: fedora-messaging-openscanhub.key - privatefile: "rabbitmq/{{env}}/pki/private/openscanhub{{env_suffix}}.key" + secret_file_app: openscanhub + secret_file_secret_name: openscanhub-fedora-messaging-key + secret_file_key: fedora-messaging-openscanhub.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/openscanhub{{env_suffix}}.key" - role: openshift/secret-file - app: openscanhub - secret_name: openscanhub-fedora-messaging-cert - key: fedora-messaging-openscanhub.crt - privatefile: "rabbitmq/{{env}}/pki/issued/openscanhub{{env_suffix}}.crt" + secret_file_app: openscanhub + secret_file_secret_name: openscanhub-fedora-messaging-cert + secret_file_key: fedora-messaging-openscanhub.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/openscanhub{{env_suffix}}.crt" - role: openshift/object object_app: openscanhub object_template: fedora-messaging-configmap.yml diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index 91a23eaf46..896149f2bb 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -83,22 +83,22 @@ object_objectname: cronjob.yml - role: openshift/secret-file - app: planet - secret_name: planet-fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: planet + secret_file_secret_name: planet-fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: planet - secret_name: planet-fedora-messaging-crt - key: planet-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/planet{{env_suffix}}.crt" + secret_file_app: planet + secret_file_secret_name: planet-fedora-messaging-crt + secret_file_key: planet-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/planet{{env_suffix}}.crt" - role: openshift/secret-file - app: planet - secret_name: planet-fedora-messaging-key - key: planet-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/planet{{env_suffix}}.key" + secret_file_app: planet + secret_file_secret_name: planet-fedora-messaging-key + secret_file_key: planet-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/planet{{env_suffix}}.key" - role: rabbit/user user_username: "planet{{ env_suffix }}" diff --git a/playbooks/openshift-apps/poddlers.yml b/playbooks/openshift-apps/poddlers.yml index dec9fb67cb..41416b42e3 100644 --- a/playbooks/openshift-apps/poddlers.yml +++ b/playbooks/openshift-apps/poddlers.yml @@ -61,22 +61,22 @@ object_objectname: buildconfig.yml - role: openshift/secret-file - app: poddlers - secret_name: toddlers-fedora-messaging-key - key: toddlers.key - privatefile: "rabbitmq/{{env}}/pki/private/toddlers{{env_suffix}}.key" + secret_file_app: poddlers + secret_file_secret_name: toddlers-fedora-messaging-key + secret_file_key: toddlers.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/toddlers{{env_suffix}}.key" - role: openshift/secret-file - app: poddlers - secret_name: toddlers-fedora-messaging-crt - key: toddlers.crt - privatefile: "rabbitmq/{{env}}/pki/issued/toddlers{{env_suffix}}.crt" + secret_file_app: poddlers + secret_file_secret_name: toddlers-fedora-messaging-crt + secret_file_key: toddlers.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/toddlers{{env_suffix}}.crt" - role: openshift/secret-file - app: poddlers - secret_name: toddlers-fedora-messaging-ca - key: toddlers.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: poddlers + secret_file_secret_name: toddlers-fedora-messaging-ca + secret_file_key: toddlers.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: poddlers diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index d38fc6a276..a401894aa3 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -20,20 +20,20 @@ project_appowners: - zlopez - role: openshift/secret-file - app: release-monitoring - secret_name: release-monitoring-fedora-messaging-ca - key: fedora-messaging-release-monitoring-ca.crt - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: release-monitoring + secret_file_secret_name: release-monitoring-fedora-messaging-ca + secret_file_key: fedora-messaging-release-monitoring-ca.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: release-monitoring - secret_name: release-monitoring-fedora-messaging-key - key: fedora-messaging-release-monitoring.key - privatefile: "rabbitmq/{{env}}/pki/private/anitya{{env_suffix}}.key" + secret_file_app: release-monitoring + secret_file_secret_name: release-monitoring-fedora-messaging-key + secret_file_key: fedora-messaging-release-monitoring.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/anitya{{env_suffix}}.key" - role: openshift/secret-file - app: release-monitoring - secret_name: release-monitoring-fedora-messaging-cert - key: fedora-messaging-release-monitoring.crt - privatefile: "rabbitmq/{{env}}/pki/issued/anitya{{env_suffix}}.crt" + secret_file_app: release-monitoring + secret_file_secret_name: release-monitoring-fedora-messaging-cert + secret_file_key: fedora-messaging-release-monitoring.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/anitya{{env_suffix}}.crt" - role: openshift/object object_app: release-monitoring object_file: imagestream.yml diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml index e484d5853a..80c8ce9819 100644 --- a/playbooks/openshift-apps/resultsdb-ci-listener.yml +++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml @@ -39,22 +39,22 @@ - apply-appowners - role: openshift/secret-file - app: resultsdb-ci-listener - secret_name: resultsdb-ci-listener-fedora-messaging-key - key: resultsdb-ci-listener.key - privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}_ci_listener.key" + secret_file_app: resultsdb-ci-listener + secret_file_secret_name: resultsdb-ci-listener-fedora-messaging-key + secret_file_key: resultsdb-ci-listener.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}_ci_listener.key" - role: openshift/secret-file - app: resultsdb-ci-listener - secret_name: resultsdb-ci-listener-fedora-messaging-crt - key: resultsdb-ci-listener.crt - privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}_ci_listener.crt" + secret_file_app: resultsdb-ci-listener + secret_file_secret_name: resultsdb-ci-listener-fedora-messaging-crt + secret_file_key: resultsdb-ci-listener.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}_ci_listener.crt" - role: openshift/secret-file - app: resultsdb-ci-listener - secret_name: resultsdb-ci-listener-fedora-messaging-ca - key: resultsdb-ci-listener.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: resultsdb-ci-listener + secret_file_secret_name: resultsdb-ci-listener-fedora-messaging-ca + secret_file_key: resultsdb-ci-listener.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: resultsdb-ci-listener diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index a073f126df..f87f2992b8 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -56,22 +56,22 @@ - apply-appowners - role: openshift/secret-file - app: resultsdb - secret_name: resultsdb-fedora-messaging-key - key: resultsdb.key - privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}.key" + secret_file_app: resultsdb + secret_file_secret_name: resultsdb-fedora-messaging-key + secret_file_key: resultsdb.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}.key" - role: openshift/secret-file - app: resultsdb - secret_name: resultsdb-fedora-messaging-crt - key: resultsdb.crt - privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}.crt" + secret_file_app: resultsdb + secret_file_secret_name: resultsdb-fedora-messaging-crt + secret_file_key: resultsdb.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}.crt" - role: openshift/secret-file - app: resultsdb - secret_name: resultsdb-fedora-messaging-ca - key: resultsdb.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: resultsdb + secret_file_secret_name: resultsdb-fedora-messaging-ca + secret_file_key: resultsdb.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" # backend objects - role: openshift/object diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index bf51787b6f..1113cf61db 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -46,22 +46,22 @@ when: env == "staging" - role: openshift/secret-file - app: the-new-hotness - secret_name: the-new-hotness-fedora-messaging-ca - key: fedora-messaging-the-new-hotness-ca.crt - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: the-new-hotness + secret_file_secret_name: the-new-hotness-fedora-messaging-ca + secret_file_key: fedora-messaging-the-new-hotness-ca.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: the-new-hotness - secret_name: the-new-hotness-fedora-messaging-key - key: fedora-messaging-the-new-hotness.key - privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness{{env_suffix}}.key" + secret_file_app: the-new-hotness + secret_file_secret_name: the-new-hotness-fedora-messaging-key + secret_file_key: fedora-messaging-the-new-hotness.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness{{env_suffix}}.key" - role: openshift/secret-file - app: the-new-hotness - secret_name: the-new-hotness-fedora-messaging-cert - key: fedora-messaging-the-new-hotness.crt - privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness{{env_suffix}}.crt" + secret_file_app: the-new-hotness + secret_file_secret_name: the-new-hotness-fedora-messaging-cert + secret_file_key: fedora-messaging-the-new-hotness.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness{{env_suffix}}.crt" - role: openshift/object object_app: the-new-hotness diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index e2458ebf66..5fb17ab98b 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -75,22 +75,22 @@ object_objectname: buildconfig.yml - role: openshift/secret-file - app: toddlers - secret_name: toddlers-fedora-messaging-key - key: toddlers.key - privatefile: "rabbitmq/{{env}}/pki/private/toddlers{{env_suffix}}.key" + secret_file_app: toddlers + secret_file_secret_name: toddlers-fedora-messaging-key + secret_file_key: toddlers.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/toddlers{{env_suffix}}.key" - role: openshift/secret-file - app: toddlers - secret_name: toddlers-fedora-messaging-crt - key: toddlers.crt - privatefile: "rabbitmq/{{env}}/pki/issued/toddlers{{env_suffix}}.crt" + secret_file_app: toddlers + secret_file_secret_name: toddlers-fedora-messaging-crt + secret_file_key: toddlers.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/toddlers{{env_suffix}}.crt" - role: openshift/secret-file - app: toddlers - secret_name: toddlers-fedora-messaging-ca - key: toddlers.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: toddlers + secret_file_secret_name: toddlers-fedora-messaging-ca + secret_file_key: toddlers.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: toddlers diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index ced11f4cc5..f1e555dc2b 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -63,22 +63,22 @@ object_objectname: secret.yml - role: openshift/secret-file - app: waiverdb - secret_name: waiverdb-fedora-messaging-key - key: waiverdb.key - privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.key" + secret_file_app: waiverdb + secret_file_secret_name: waiverdb-fedora-messaging-key + secret_file_key: waiverdb.key + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.key" - role: openshift/secret-file - app: waiverdb - secret_name: waiverdb-fedora-messaging-crt - key: waiverdb.crt - privatefile: "rabbitmq/{{env}}/pki/issued/waiverdb{{env_suffix}}.crt" + secret_file_app: waiverdb + secret_file_secret_name: waiverdb-fedora-messaging-crt + secret_file_key: waiverdb.crt + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/waiverdb{{env_suffix}}.crt" - role: openshift/secret-file - app: waiverdb - secret_name: waiverdb-fedora-messaging-ca - key: waiverdb.ca - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: waiverdb + secret_file_secret_name: waiverdb-fedora-messaging-ca + secret_file_key: waiverdb.ca + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object object_app: waiverdb diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 333d690cff..d117abf21e 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -50,20 +50,20 @@ - apply-appowners - role: openshift/secret-file - app: webhook2fedmsg - secret_name: fedora-messaging-ca - key: cacert.pem - privatefile: "rabbitmq/{{env}}/pki/ca.crt" + secret_file_app: webhook2fedmsg + secret_file_secret_name: fedora-messaging-ca + secret_file_key: cacert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/secret-file - app: webhook2fedmsg - secret_name: fedora-messaging-crt - key: webhook2fedmsg-cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/webhook2fedmsg{{env_suffix}}.crt" + secret_file_app: webhook2fedmsg + secret_file_secret_name: fedora-messaging-crt + secret_file_key: webhook2fedmsg-cert.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/webhook2fedmsg{{env_suffix}}.crt" - role: openshift/secret-file - app: webhook2fedmsg - secret_name: fedora-messaging-key - key: webhook2fedmsg-key.pem - privatefile: "rabbitmq/{{env}}/pki/private/webhook2fedmsg{{env_suffix}}.key" + secret_file_app: webhook2fedmsg + secret_file_secret_name: fedora-messaging-key + secret_file_key: webhook2fedmsg-key.pem + secret_file_privatefile: "rabbitmq/{{env}}/pki/private/webhook2fedmsg{{env_suffix}}.key" - role: openshift/imagestream imagestream_app: webhook2fedmsg diff --git a/roles/openshift/secret-file/defaults/main.yml b/roles/openshift/secret-file/defaults/main.yml index 84c8da5b3b..365e6cae30 100644 --- a/roles/openshift/secret-file/defaults/main.yml +++ b/roles/openshift/secret-file/defaults/main.yml @@ -1,3 +1,3 @@ --- -os_app: "{{app}}" +os_app: "{{secret_file_app}}" ocp4: false diff --git a/roles/openshift/secret-file/tasks/main.yml b/roles/openshift/secret-file/tasks/main.yml index 6e98fc7b36..af3bc19079 100644 --- a/roles/openshift/secret-file/tasks/main.yml +++ b/roles/openshift/secret-file/tasks/main.yml @@ -1,32 +1,32 @@ --- -- name: Copy template {{template}} - template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{os_app}}/{{key}} - when: template is defined +- name: Copy template {{secret_file_template}} + template: src={{roles_path}}/openshift-apps/{{secret_file_app}}/templates/{{secret_file_template}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} + when: secret_file_template is defined register: secret_template -- name: Copy file {{file}} - copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{os_app}}/{{key}} - when: file is defined +- name: Copy file {{secret_file_file}} + copy: src={{roles_path}}/openshift-apps/{{secret_file_app}}/files/{{secret_file_file}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} + when: secret_file_file is defined register: secret_file -- name: Copy private file {{privatefile}} - copy: src={{private}}/files/{{privatefile}} dest=/etc/openshift_apps/{{os_app}}/{{key}} - when: privatefile is defined +- name: Copy private file {{secret_file_privatefile}} + copy: src={{private}}/files/{{secret_file_privatefile}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} + when: secret_file_privatefile is defined register: secret_privatefile - name: Delete existing secrets - shell: oc -n {{os_app}} delete secret/{{secret_name}} + shell: oc -n {{os_app}} delete secret/{{secret_file_secret_name}} register: delete_out changed_when: "'NotFound' in delete_out.stderr" failed_when: "('NotFound' not in delete_out.stderr) and (delete_out.rc != 0)" when: secret_template.changed or secret_file.changed or secret_privatefile.changed - name: Call `oc secrets new` on the copied file - shell: oc -n {{os_app}} secrets new {{secret_name}} {{key}}=/etc/openshift_apps/{{os_app}}/{{key}} + shell: oc -n {{os_app}} secrets new {{secret_file_secret_name}} {{secret_file_key}}=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} register: create_out when: not ocp4 and (secret_template.changed or secret_file.changed or secret_privatefile.changed) - name: Call `oc create secret generic` on the copied file - shell: oc -n {{os_app}} create secret generic {{secret_name}} --from-file={{key}}=/etc/openshift_apps/{{os_app}}/{{key}} + shell: oc -n {{os_app}} create secret generic {{secret_file_secret_name}} --from-file={{secret_file_key}}=/etc/openshift_apps/{{os_app}}/{{secret_file_key}} register: create_out when: ocp4 and (secret_template.changed or secret_file.changed or secret_privatefile.changed)