Révision 45 trunk/shell/front-end-finish-up

front-end-finish-up (revision 45)
25 25
CURRENT_PATH=/etc/xen
26 26
cp templates$CURRENT_PATH/$CONST_FRONT_END_XEN_TEMPLATE_NAME \
27 27
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
28
rpl Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
29
rpl __FRONT_END_KERNEL__ $FRONT_END_KERNEL \
28
rpl -q Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
29
rpl -q __FRONT_END_KERNEL__ $FRONT_END_KERNEL \
30 30
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
31
rpl __FRONT_END_RAMDISK__ $FRONT_END_RAMDISK \
31
rpl -q __FRONT_END_RAMDISK__ $FRONT_END_RAMDISK \
32 32
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
33
rpl __FRONT_END_VCPUS_NUM__ $FRONT_END_VCPUS_NUM \
33
rpl -q __FRONT_END_VCPUS_NUM__ $FRONT_END_VCPUS_NUM \
34 34
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
35 35
CPUS_LIST=$FRONT_END_CPUS_LIST
36 36
CPUS=""
......
43 43
        CPUS="$CPUS,$i"
44 44
    fi
45 45
done
46
rpl __FRONT_END_CPUS__ $CPUS \
46
rpl -q __FRONT_END_CPUS__ $CPUS \
47 47
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
48 48
# Memory
49
rpl __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
49
rpl -q __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
50 50
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
51 51
# Root device
52
rpl __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
52
rpl -q __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
53 53
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
54 54
#
55 55
# System disk stuff
56 56
FRONT_END_SYSTEM_DISK_STANZA="'phy:${FRONT_END_SYSTEM_VOLUME_GROUP_DEVICE}/${FRONT_END_SYSTEM_DISK},$FRONT_END_SYSTEM_VIRTUAL_VOLUME,w'"
57
rpl __FRONT_END_SYSTEM_DISK_STANZA__ "$FRONT_END_SYSTEM_DISK_STANZA" \
57
rpl -q __FRONT_END_SYSTEM_DISK_STANZA__ "$FRONT_END_SYSTEM_DISK_STANZA" \
58 58
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
59 59
# Home disk stuff
60 60
FRONT_END_HOME_DISK_STANZA="'phy:${FRONT_END_HOME_VOLUME_GROUP_DEVICE}/${FRONT_END_HOME_DISK},$FRONT_END_HOME_VIRTUAL_VOLUME,w'"
61
rpl __FRONT_END_HOME_DISK_STANZA__ "$FRONT_END_HOME_DISK_STANZA" \
61
rpl -q __FRONT_END_HOME_DISK_STANZA__ "$FRONT_END_HOME_DISK_STANZA" \
62 62
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
63 63
# Swap disk stuff.
64 64
if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
65 65
  FRONT_END_SWAP_DISK_STANZA="'phy:${FRONT_END_SWAP_VOLUME_GROUP_DEVICE}/${FRONT_END_SWAP_DISK},$FRONT_END_SWAP_VIRTUAL_VOLUME,w'"
66
  rpl __FRONT_END_SWAP_DISK_STANZA__ $FRONT_END_SWAP_DISK_STANZA \
66
  rpl -q __FRONT_END_SWAP_DISK_STANZA__ $FRONT_END_SWAP_DISK_STANZA \
67 67
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
68 68
  # Comment out the noswap stanza.
69
  rpl __FRONT_END_NOSWAP__ "#$CLUSTER_NOSWAP" \
69
  rpl -q __FRONT_END_NOSWAP__ "#$CLUSTER_NOSWAP" \
70 70
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
71 71
else
72
  echo y | rpl -f __FRONT_END_SWAP_DISK_STANZA__ "" \
72
  rpl -q __FRONT_END_SWAP_DISK_STANZA__ "" \
73 73
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
74
  rpl __FRONT_END_NOSWAP__ $CLUSTER_NOSWAP \
74
  rpl -q __FRONT_END_NOSWAP__ $CLUSTER_NOSWAP \
75 75
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
76 76
fi
77 77
#
78
rpl __FRONT_END_HOST_NAME__ $CURRENT_HOST_NAME \
78
rpl -q __FRONT_END_HOST_NAME__ $CURRENT_HOST_NAME \
79 79
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
80 80
# Vif stuff.
81 81
VIF_STANZA=$CONST_XEN_VIF_STANZA_PREFIX
......
84 84
INTERNAL_BRIDGE="${CONST_XEN_BRIDGE_PREFIX}${CLUSTER_BRIDGE_NAME}"
85 85
INTERNAL_IP="${CONST_XEN_IP_PREFIX}${FRONT_END_CLUSTER_STATIC_IP}"
86 86
if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ;then
87
  rpl __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
87
  rpl -q __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
88 88
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
89 89
  VIF_STANZA=${VIF_STANZA}${EXTERNAL_MAC}"','"${INTERNAL_IP}","${INTERNAL_MAC}","${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
90 90
else
91 91
  # Comment out the DHCP_STANZA.
92
  rpl __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
92
  rpl -q __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
93 93
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
94 94
  VIF_STANZA=${VIF_STANZA}${EXTERNAL_IP}","${EXTERNAL_MAC}",'"${INTERNAL_IP}","${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
95 95
fi
96 96
# In any case, write the VIF_STANZA
97
rpl __VIF_STANZA__ "$VIF_STANZA" \
97
rpl -q __VIF_STANZA__ "$VIF_STANZA" \
98 98
   $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
99 99
# Console stuff as extra parameter
100
rpl __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
100
rpl -q __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
101 101
     $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
102 102
# End creation of Xen configuration file.
103 103
#
......
142 142
   $FRONT_END_FILE_SYSTEM_MOUNT_POINT$CURRENT_PATH/interfaces
143 143
if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ; then
144 144
  ETH0_STANZA="iface eth0 inet dhcp"
145
  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
145
  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
146 146
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
147
  echo y | rpl __ETH0_STATIC_ADDRESS__ "" \
147
  rpl -q __ETH0_STATIC_ADDRESS__ "" \
148 148
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
149
  echo y | rpl __ETH0_STATIC_NETMASK__ "" \
149
  rpl -q __ETH0_STATIC_NETMASK__ "" \
150 150
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
151
  echo y | rpl __ETH0_STATIC_NETWORK__ "" \
151
  rpl -q __ETH0_STATIC_NETWORK__ "" \
152 152
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
153
  echo y | rpl __ETH0_STATIC_GATEWAY__ "" \
153
  rpl -q __ETH0_STATIC_GATEWAY__ "" \
154 154
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
155
  echo y | rpl __ETH0_STATIC_BROADCAST__ "" \
155
  rpl -q __ETH0_STATIC_BROADCAST__ "" \
156 156
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
157
  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "" \
157
  rpl -q __ETH0_STATIC_NAMESERVERS__ "" \
158 158
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
159
  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "" \
159
  rpl -q __ETH0_STATIC_DNS_SEARCH__ "" \
160 160
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
161 161
else
162 162
  ETH0_STANZA="iface eth0 inet static"
163
  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
163
  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
164 164
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
165
  echo y | rpl __ETH0_STATIC_ADDRESS__ "$FRONT_END_CLUSTER_STATIC_IP" \
165
  rpl -q __ETH0_STATIC_ADDRESS__ "$FRONT_END_CLUSTER_STATIC_IP" \
166 166
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
167
  echo y | rpl __ETH0_STATIC_NETMASK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETMASK" \
167
  rpl -q __ETH0_STATIC_NETMASK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETMASK" \
168 168
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
169
  echo y | rpl __ETH0_STATIC_NETWORK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETWORK" \
169
  rpl -q __ETH0_STATIC_NETWORK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETWORK" \
170 170
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
171
  echo y | rpl __ETH0_STATIC_GATEWAY__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
171
  rpl -q __ETH0_STATIC_GATEWAY__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
172 172
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
173
  echo y | rpl __ETH0_STATIC_BROADCAST__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
173
  rpl -q __ETH0_STATIC_BROADCAST__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
174 174
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
175
  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
175
  rpl -q __ETH0_STATIC_NAMESERVERS__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
176 176
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
177
  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
177
  rpl-q __ETH0_STATIC_DNS_SEARCH__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
178 178
      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
179 179
fi 
180 180
# Static address on the cluster interface.
181 181
ADDRESS="${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}"
182
rpl __ETH1_STATIC_ADDRESS__ $ADDRESS  \
182
rpl -q __ETH1_STATIC_ADDRESS__ $ADDRESS  \
183 183
    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
184
rpl __ETH1_STATIC_NETMASK__ $CLUSTER_STATIC_NETMASK  \
184
rpl -q __ETH1_STATIC_NETMASK__ $CLUSTER_STATIC_NETMASK  \
185 185
    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
186 186
    
187 187
# /etc/hostname
......
195 195
CURRENT_PATH=/etc
196 196
cp $TEMPLATES_DIR$CURRENT_PATH/resolv.conf \
197 197
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
198
rpl __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
198
rpl -q __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
199 199
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
200
rpl __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
200
rpl -q __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
201 201
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
202 202
#
203 203
# /etc/fstab
......
208 208
  # Front-End System Disk Line
209 209
FESDL=${FRONT_END_SYSTEM_VIRTUAL_VOLUME_DEVICE}
210 210
FESDL="$FESDL	/		$FRONT_END_SYSTEM_DISK_FILE_SYSTEM	errors=remount-ro	0	1"
211
rpl __FRONT_END_SYSTEM_DISK_LINE__ "$FESDL" \
211
rpl -q __FRONT_END_SYSTEM_DISK_LINE__ "$FESDL" \
212 212
  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
213 213
  # Font-End Home Disk Line
214 214
FEHDL=${FRONT_END_HOME_VIRTUAL_VOLUME_DEVICE}
215 215
FEHDL="$FEHDL	/home		$FRONT_END_HOME_DISK_FILE_SYSTEM	errors=remount-ro	0	2"
216
rpl __FRONT_END_HOME_DISK_LINE__ "$FEHDL" \
216
rpl -q __FRONT_END_HOME_DISK_LINE__ "$FEHDL" \
217 217
  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
218 218
  # Font-End Swap Disk Line
219 219
if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
......
222 222
else
223 223
  FESDL=""
224 224
fi
225
# "rpl -f" since $FESDL can be an empty string.
226
rpl -f __FRONT_END_SWAP_DISK_LINE__ "$FESDL" \
225
# "rpl -q" since $FESDL can be an empty string.
226
rpl -q __FRONT_END_SWAP_DISK_LINE__ "$FESDL" \
227 227
  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
228 228
#
229 229
# End /etc/fstab stuff.
......
240 240
cp ${TEMPLATES_DIR}${CURRENT_PATH}/${FRONT_END_EXPORTS_TEMPLATE} \
241 241
  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
242 242
NFS_HOME_STANZA="$CLUSTER_STATIC_NETWORK_PREFIX.0/${CLUSTER_STATIC_NETMASK}$FRONT_END_NFS_OPTIONS"
243
rpl __NFS_HOME_STANZA__ "$NFS_HOME_STANZA" \
243
rpl -q __NFS_HOME_STANZA__ "$NFS_HOME_STANZA" \
244 244
  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
245 245
#
246 246
# End NFS V4 stuff.
247 247
#
248
# Umount the compute node system disk
248
# Umount the front-end system disk
249 249
#
250 250
# Order matters since the /home file system is mounted on the
251 251
# on the system partition

Formats disponibles : Unified diff