git://git.onelab.eu
/
nodeconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use the deployment tag to get the repo directory.
[nodeconfig.git]
/
yum
/
myplc.repo.php
diff --git
a/yum/myplc.repo.php
b/yum/myplc.repo.php
index
492e2fb
..
01b4a97
100644
(file)
--- a/
yum/myplc.repo.php
+++ b/
yum/myplc.repo.php
@@
-40,6
+40,7
@@
if ( ! isset($_REQUEST['slicefamily'])) {
# the nodegroups the node is part of
$nodegroup_names=array();
# the nodegroups the node is part of
$nodegroup_names=array();
+$deployment = "";
if ( ! isset($_REQUEST['node_id'])) {
print "# Warning : node_id not set\n";
} else {
if ( ! isset($_REQUEST['node_id'])) {
print "# Warning : node_id not set\n";
} else {
@@
-50,15
+51,27
@@
if ( ! isset($_REQUEST['node_id'])) {
$nodegroup_ids = $nodes[0]['nodegroup_ids'];
$nodegroups = $adm->GetNodeGroups($nodegroup_ids);
foreach ($nodegroups as $nodegroup) {
$nodegroup_ids = $nodes[0]['nodegroup_ids'];
$nodegroups = $adm->GetNodeGroups($nodegroup_ids);
foreach ($nodegroups as $nodegroup) {
- $nodegroup_name = $nodegroup['name'];
+ $nodegroup_name = $nodegroup['
group
name'];
$nodegroup_names [] = $nodegroup_name;
echo "# in nodegroup $nodegroup_name \n" ;
}
$nodegroup_names [] = $nodegroup_name;
echo "# in nodegroup $nodegroup_name \n" ;
}
+ $node_tag_ids = $nodes[0]['node_tag_ids'];
+ $node_tags = $adm->GetNodeTags($node_tag_ids);
+ foreach ($node_tags as $node_tag) {
+ if ($node_tag['tagname'] == 'deployment') {
+ $deployment = $node_tag['value'];
+ break;
+ }
+ }
}
$topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/";
$topurl="https://$PLC_BOOT_HOST" . "/install-rpms/";
}
$topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/";
$topurl="https://$PLC_BOOT_HOST" . "/install-rpms/";
+if ($deployment == 'alpha') {
+ $topdir = $topdir . "alpha/";
+ $topurl = $topurl . "alpha/";
+}
# locate the planetlab repo for this node family & nodegroup
$repo=NULL;
# locate the planetlab repo for this node family & nodegroup
$repo=NULL;