Révision 24

trunk/shell/create-start-front-end (revision 24)
67 67
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
68 68
rpl __FRONT_END_RAMDISK__ $FRONT_END_RAMDISK \
69 69
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
70
rpl __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
71
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
72 70
rpl __FRONT_END_VCPUS_NUM__ $FRONT_END_VCPUS_NUM \
73 71
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
74 72
CPUS_LIST=$FRONT_END_CPUS_LIST
......
84 82
done
85 83
rpl __FRONT_END_CPUS__ $CPUS \
86 84
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
85
# Memory
86
rpl __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
87
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
88
# Root device
89
rpl __XEN_SYSTEM_DISK_ROOT_DEVICE__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE" \
90
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
91
#
87 92
rpl __FRONT_END_SYSTEM_DISK__ $FRONT_END_SYSTEM_VOLUME_GROUP_DEVICE/$FRONT_END_SYSTEM_DISK \
88 93
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
89 94
rpl __FRONT_END_HOME_DISK__ $FRONT_END_HOME_VOLUME_GROUP_DEVICE/$FRONT_END_HOME_DISK \
......
107 112
VIF_STANZA=$CONST_XEN_VIF_STANZA_PREFIX
108 113
EXTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${FRONT_END_EXTERNAL_MAC_ADDRESS}"
109 114
INTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${FRONT_END_CLUSTER_MAC_ADDRESS}"
110
INTERNAL_BRIDGE="{$CONST_XEN_BRIDGE_PREFIX}${CLUSTER_BRIDGE_NAME}"
111
INTERNAL_IP=$FRONT_END_CLUSTER_STATIC_IP
115
INTERNAL_BRIDGE="${CONST_XEN_BRIDGE_PREFIX}${CLUSTER_BRIDGE_NAME}"
116
INTERNAL_IP="${CONST_XEN_IP_PREFIX}${FRONT_END_CLUSTER_STATIC_IP}"
112 117
if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ;then
113 118
  rpl __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
114 119
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
115
  VIF_STANZA="${VIF_STANZA}${EXTERNAL_MAC}','${INTERNAL_IP},${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}"
120
  VIF_STANZA=${VIF_STANZA}${EXTERNAL_MAC}"','"${INTERNAL_IP}","${INTERNAL_MAC}","${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
116 121
else
117 122
  # Comment out the DHCP_STANZA.
118 123
  rpl __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
119 124
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
120
  VIF_STANZA="${VIF_STANZA}${EXTERNAL_IP},${EXTERNAL_MAC},'${INTERNAL_IP},${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}"
125
  VIF_STANZA=${VIF_STANZA}${EXTERNAL_IP}","${EXTERNAL_MAC}",'"${INTERNAL_IP}","${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
121 126
fi
122 127
# In any case, write the VIF_STANZA
123
rpl __VIF_STANZA__ $VIF_STANZA \
128
rpl __VIF_STANZA__ "$VIF_STANZA" \
124 129
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
125 130
#
126 131
exit 0
......
131 136
#
132 137
# Start the virtual machine
133 138
#
134
xm create $SCRIPT_PATH/$CURRENT_HOST_NAME.cfg
139
xm create $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
135 140
#
136 141
# Wait until the virtual machine has started
137 142
#
trunk/shell/c-i-a-b.common (revision 24)
14 14
CONST_XEN_MAC_PREFIX="mac="
15 15
CONST_XEN_NOSWAP="noswap = 1" # For /etc/xen-tools/xen-tools.conf.
16 16
CONST_XEN_NETWORK_SCRIPT_KEYWORD=network-script # For /etc/xen/xend-config.sxp.
17
CONST_XEN_SYSTEM_DISK_ROOT_DEVICE="/dev/xvda1 ro"
17 18
CONST_XEN_VIF_STANZA_POSTFIX="' ]"
18 19
CONST_XEN_VIF_STANZA_PREFIX="vif         = [ '"
19 20
#
......
60 61
FRONT_END_HOME_DISK=front-end-home-disk
61 62
FRONT_END_HOME_DISK_FILE_SYSTEM=ext3
62 63
#FRONT_END_HOME_DISK_SIZE=512G
63
FRONT_END_HOME_DISK_SIZE=10G
64
FRONT_END_HOME_DISK_SIZE=5G
64 65
FRONT_END_HOME_VOLUME_GROUP=vg_slow
65 66
FRONT_END_HOME_VOLUME_GROUP_DEVICE="/dev/$FRONT_END_HOME_VOLUME_GROUP"
66 67
FRONT_END_HOST_NAME="tamadi-1-fe"
67 68
FRONT_END_INTERFACES_TEMPLATE=interfaces.front-end
68 69
FRONT_END_KERNEL=/boot/vmlinuz-`uname -r`
69
FRONT_END_MEMORY=8G
70
FRONT_END_MEMORY=8192 # Must be in Mb for Xen 4.0
70 71
FRONT_END_STATIC_NETWORK_POSTFIX=251
71 72
FRONT_END_CLUSTER_STATIC_IP="$CLUSTER_STATIC_NETWORK_PREFIX.$FRONT_END_STATIC_NETWORK_POSTFIX"
72 73
FRONT_END_EXTERNAL_STATIC_IP="$CLUSTER_STATIC_NETWORK_PREFIX.$FRONT_END_STATIC_NETWORK_POSTFIX"
trunk/shell/templates/etc/xen/front-end.cfg (revision 24)
11 11

  
12 12
vcpus       = '__FRONT_END_VCPUS_NUM__'
13 13
cpus        = '__FRONT_END_CPUS__'
14
memory      = '__FRONT_END_RAMDISK__'
14
memory      = '__FRONT_END_MEMORY__'
15 15

  
16 16
#
17 17
#  Disk device(s).
18 18
#
19
root        = '/dev/xvda2 ro'
19
root        = '__XEN_SYSTEM_DISK_ROOT_DEVICE__'
20 20
disk        = [
21 21
                  'phy:__FRONT_END_SYSTEM_DISK__,xvda1,w',
22 22
                  'phy:__FRONT_END_HOME_DISK__,xvda2,w',

Formats disponibles : Unified diff