Some of the csi_primary_contact variables point to IRC channels. In order to avoid commenting these channels out, we set these variables with quotes. --- inventory/group_vars/copr-back | 2 +- inventory/group_vars/copr-back-stg | 2 +- inventory/group_vars/copr-front | 2 +- inventory/group_vars/copr-front-stg | 2 +- inventory/group_vars/wiki | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back index f6303f1..d229f52 100644 --- a/inventory/group_vars/copr-back +++ b/inventory/group_vars/copr-back @@ -26,7 +26,7 @@ frontend_base_url: "https://copr.fedorainfracloud.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/
csi_security_category: High -csi_primary_contact: msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys +csi_primary_contact: "msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the backend for copr (3rd party packages) csi_relationship: | - Backend: Management of copr cloud infrastructure (OpenStack). diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg index 37905d7..99f7d99 100644 --- a/inventory/group_vars/copr-back-stg +++ b/inventory/group_vars/copr-back-stg @@ -24,6 +24,6 @@ frontend_base_url: "http://copr-fe-dev.cloud.fedoraproject.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/
csi_security_category: Moderate -csi_primary_contact: msuchy (mirek, clime, frostyx, asamalik) IRC #fedora-admin, #fedora-buildsys +csi_primary_contact: "msuchy (mirek, clime, frostyx, asamalik) IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the testing environment of copr's backend csi_relationship: This host is the testing environment for the cloud infrastructure of copr's backend diff --git a/inventory/group_vars/copr-front b/inventory/group_vars/copr-front index a7d3781..135787f 100644 --- a/inventory/group_vars/copr-front +++ b/inventory/group_vars/copr-front @@ -7,7 +7,7 @@ copr_frontend_public_hostname: "copr.fedorainfracloud.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/
csi_security_category: Moderate -csi_primary_contact: msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys +csi_primary_contact: "msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide a publicly accessible frontend for 3rd party packages (copr) csi_relationship: | - This host provides the frontend part of copr only. diff --git a/inventory/group_vars/copr-front-stg b/inventory/group_vars/copr-front-stg index 6b7d14d..2f35188 100644 --- a/inventory/group_vars/copr-front-stg +++ b/inventory/group_vars/copr-front-stg @@ -2,6 +2,6 @@ copr_frontend_public_hostname: "copr-fe-dev.cloud.fedoraproject.org"
csi_security_category: Low -csi_primary_contact: msuchy (mirek, vgologuz) | IRC #fedora-admin, #fedora-buildsys +csi_primary_contact: "msuchy (mirek, vgologuz) | IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the testing environment of copr's frontend csi_relationship: This host is the testing environment for copr's web interface diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index 5498270..292c237 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -33,7 +33,7 @@ fedmsg_certs: nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
csi_security_category: Moderate -csi_primary_contact: #fedora-admin +csi_primary_contact: "#fedora-admin" csi_purpose: Provides our wiki csi_relationship: | - There are multiple servers that this service requires. All proxy servers and Wiki 1 and 2.
This looks good to me, but we are in freeze and wiki group is frozen.
So, we could just wait until after freeze to push this out, get a freeze break or split it and only do the non wiki parts of it now. ;)
kevin
On Tue, 14 Jun 2016 10:51:14 -0600 Kevin Fenzi kevin@scrye.com wrote:
This looks good to me, but we are in freeze and wiki group is frozen.
So, we could just wait until after freeze to push this out, get a freeze break or split it and only do the non wiki parts of it now. ;)
Since this is really low priority, I think we could just wait. Not enough changes to split it in different commits anyway :)
Should this be merged now?
On Wed, 6 Jul 2016 14:38:47 -0300 Athos Ribeiro athoscribeiro@gmail.com wrote:
Should this be merged now?
Indeed. ;)
However, it seems it doesn't apply cleanly anymore. Can you rework it against current git?
kevin
infrastructure@lists.fedoraproject.org
-
Athos Ribeiro -
Kevin Fenzi