Merge branch 'linkmedia-accesses' into 'master'

[rennes][abacus3|10|18] Changed Linkmedia accesses

See merge request !1097

data/grid5000/accesses/nodesets.json

@@ -76,7 +76,23 @@
     }
   },
   "abacus10": {
-    "besteffort": {
+    "p1": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    },
+    "p3": {
       "ggas": [
         "cidre",
         "kerdata",
@@ -107,7 +123,14 @@
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
-        "mc-siege",
+        "mc-siege"
+      ]
+    },
+    "p4": {
+      "ggas": [
+
+      ],
+      "sites": [
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -119,16 +142,6 @@
         "slices-fr-strasbourg",
         "slices-fr-toulouse"
       ]
-    },
-    "p1": {
-      "ggas": [
-        "linkmedia",
-        "artishau"
-      ],
-      "sites": [
-        "mc-staff-site",
-        "g5k-staff-site"
-      ]
     }
   },
   "abacus11": {
@@ -456,7 +469,23 @@
     }
   },
   "abacus18": {
-    "besteffort": {
+    "p1": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    },
+    "p3": {
       "ggas": [
         "cidre",
         "kerdata",
@@ -487,7 +516,14 @@
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
-        "mc-siege",
+        "mc-siege"
+      ]
+    },
+    "p4": {
+      "ggas": [
+
+      ],
+      "sites": [
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -499,16 +535,6 @@
         "slices-fr-strasbourg",
         "slices-fr-toulouse"
       ]
-    },
-    "p1": {
-      "ggas": [
-        "linkmedia",
-        "artishau"
-      ],
-      "sites": [
-        "mc-staff-site",
-        "g5k-staff-site"
-      ]
     }
   },
   "abacus19": {
@@ -1114,7 +1140,23 @@
     }
   },
   "abacus3": {
-    "besteffort": {
+    "p1": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    },
+    "p3": {
       "ggas": [
         "cidre",
         "kerdata",
@@ -1145,7 +1187,14 @@
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
-        "mc-siege",
+        "mc-siege"
+      ]
+    },
+    "p4": {
+      "ggas": [
+
+      ],
+      "sites": [
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1157,16 +1206,6 @@
         "slices-fr-strasbourg",
         "slices-fr-toulouse"
       ]
-    },
-    "p1": {
-      "ggas": [
-        "linkmedia",
-        "artishau"
-      ],
-      "sites": [
-        "mc-staff-site",
-        "g5k-staff-site"
-      ]
     }
   },
   "abacus4": {

input/grid5000/access/rennes.yaml

@@ -38,12 +38,9 @@ abacus1: *sairpico-shared
 abacus2: *sairpico-shared
 
 ## LINKMEDIA & ARTISHAU
-abacus3: &linkmedia-artishau-exclusive
+abacus21:
     p1: [linkmedia, artishau, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
-abacus10: *linkmedia-artishau-exclusive
-abacus18: *linkmedia-artishau-exclusive
-abacus21: *linkmedia-artishau-exclusive
 
 ## ARTISHAU
 abacus26: &artishau-exclusive
@@ -95,10 +92,13 @@ roazhon10: *inria-rennes
 roazhon11: *inria-rennes
 roazhon12: *inria-rennes
 roazhon13: *inria-rennes
+abacus3: *inria-rennes
 abacus4: *inria-rennes
 abacus8: *inria-rennes
 abacus9: *inria-rennes
+abacus10: *inria-rennes
 abacus14: *inria-rennes
 abacus16: *inria-rennes
+abacus18: *inria-rennes
 abacus25: *inria-rennes
 abacus28: *inria-rennes