Skip to content

Commit f4157ca

Browse files
alexpilottialexpilotti
committed
RDO Havana support
1 parent 51ccf88 commit f4157ca

7 files changed

+139
-80
lines changed

‎configure-rdo.sh

+85-49
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
#!/bin/bash
22
set -e
33

4-
if [ $# -ne 9 ]; then
5-
echo "Usage: $0 <ssh_key_file> <controller_host_name> <controller_host_ip> <network_host_name> <network_host_ip> <qemu_compute_host_name> <qemu_compute_host_ip> <hyperv_compute_host_name> <hyperv_compute_host_ip>"
4+
if [ $# -ne 10 ]; then
5+
echo "Usage: $0 <openstack_release> <ssh_key_file> <controller_host_name> <controller_host_ip> <network_host_name> <network_host_ip> <qemu_compute_host_name> <qemu_compute_host_ip> <hyperv_compute_host_name> <hyperv_compute_host_ip>"
66
exit 1
77
fi
88

9-
SSH_KEY_FILE=$1
9+
OPENSTACK_RELEASE=$1
1010

11-
CONTROLLER_VM_NAME=$2
12-
CONTROLLER_VM_IP=$3
13-
NETWORK_VM_NAME=$4
14-
NETWORK_VM_IP=$5
15-
QEMU_COMPUTE_VM_NAME=$6
16-
QEMU_COMPUTE_VM_IP=$7
17-
HYPERV_COMPUTE_VM_NAME=$8
18-
HYPERV_COMPUTE_VM_IP=$9
11+
SSH_KEY_FILE=$2
12+
13+
CONTROLLER_VM_NAME=$3
14+
CONTROLLER_VM_IP=$4
15+
NETWORK_VM_NAME=$5
16+
NETWORK_VM_IP=$6
17+
QEMU_COMPUTE_VM_NAME=$7
18+
QEMU_COMPUTE_VM_IP=$8
19+
HYPERV_COMPUTE_VM_NAME=$9
20+
HYPERV_COMPUTE_VM_IP=${10}
1921

2022
RDO_ADMIN=root
2123
RDO_ADMIN_PASSWORD=Passw0rd
2224

2325
HYPERV_ADMIN=Administrator
2426
HYPERV_PASSWORD=$RDO_ADMIN_PASSWORD
2527

26-
OPENSTACK_RELEASE=grizzly
27-
2828
ANSWERS_FILE=packstack_answers.conf
2929
NOVA_CONF_FILE=/etc/nova/nova.conf
30+
CEILOMETER_CONF_FILE=/etc/ceilometer/ceilometer.conf
3031

3132
DOMAIN=localdomain
3233

@@ -41,20 +42,11 @@ if [ ! -f "$SSH_KEY_FILE" ]; then
4142
fi
4243
SSH_KEY_FILE_PUB=$SSH_KEY_FILE.pub
4344

44-
configure_ssh_pubkey_auth () {
45-
HOST=$1
46-
ssh-keygen -R $HOST
47-
48-
wait_for_listening_port $HOST 22 $MAX_WAIT_SECONDS
49-
$BASEDIR/scppass.sh $SSH_KEY_FILE_PUB $RDO_ADMIN@$HOST:$SSH_KEY_FILE_PUB "$RDO_ADMIN_PASSWORD"
50-
$BASEDIR/sshpass.sh $RDO_ADMIN@$HOST "$RDO_ADMIN_PASSWORD" "mkdir -p ~/.ssh && chmod 700 ~/.ssh && cat $SSH_KEY_FILE_PUB >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys && restorecon -R -v ~/.ssh"
51-
}
52-
5345
echo "Configuring SSH public key authentication on the RDO hosts"
5446

55-
configure_ssh_pubkey_auth $CONTROLLER_VM_IP
56-
configure_ssh_pubkey_auth $NETWORK_VM_IP
57-
configure_ssh_pubkey_auth $QEMU_COMPUTE_VM_IP
47+
configure_ssh_pubkey_auth $RDO_ADMIN $CONTROLLER_VM_IP $SSH_KEY_FILE_PUB $RDO_ADMIN_PASSWORD
48+
configure_ssh_pubkey_auth $RDO_ADMIN $NETWORK_VM_IP $SSH_KEY_FILE_PUB $RDO_ADMIN_PASSWORD
49+
configure_ssh_pubkey_auth $RDO_ADMIN $QEMU_COMPUTE_VM_IP $SSH_KEY_FILE_PUB $RDO_ADMIN_PASSWORD
5850

5951
echo "Sync hosts date and time"
6052
update_host_date $RDO_ADMIN@$CONTROLLER_VM_IP
@@ -67,11 +59,11 @@ echo "Waiting for WinRM HTTPS port to be available on $HYPERV_COMPUTE_VM_IP"
6759
wait_for_listening_port $HYPERV_COMPUTE_VM_IP 5986 $MAX_WAIT_SECONDS
6860

6961
echo "Renaming and rebooting Hyper-V host $HYPERV_COMPUTE_VM_IP"
70-
exec_with_retry "$BASEDIR/rename-windows-host.sh $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD $HYPERV_COMPUTE_VM_NAME"
62+
exec_with_retry "$BASEDIR/rename-windows-host.sh $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD $HYPERV_COMPUTE_VM_NAME" 30 30
7163

7264
config_openstack_network_adapter () {
7365
SSHUSER_HOST=$1
74-
ADAPTER=$2
66+
ADAPTER=$2
7567

7668
run_ssh_cmd_with_retry $SSHUSER_HOST "cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$ADAPTER
7769
DEVICE="$ADAPTER"
@@ -128,7 +120,7 @@ set_test_network_config $RDO_ADMIN@$QEMU_COMPUTE_VM_IP $QEMU_COMPUTE_VM_TEST_IP/
128120

129121
echo "Installing RDO RPMs on controller"
130122

131-
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "yum install -y http://rdo.fedorapeople.org/openstack/openstack-grizzly/rdo-release-grizzly.rpm || true"
123+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "yum install -y http://rdo.fedorapeople.org/openstack/openstack-$OPENSTACK_RELEASE/rdo-release-$OPENSTACK_RELEASE.rpm || true"
132124
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "yum install -y openstack-packstack"
133125

134126
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "yum -y install http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm || true"
@@ -145,14 +137,27 @@ crudini --set $ANSWERS_FILE general CONFIG_SSH_KEY /root/.ssh/id_rsa.pub && \
145137
crudini --set $ANSWERS_FILE general CONFIG_NTP_SERVERS 0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org && \
146138
crudini --set $ANSWERS_FILE general CONFIG_CINDER_VOLUMES_SIZE 20G && \
147139
crudini --set $ANSWERS_FILE general CONFIG_NOVA_COMPUTE_HOSTS $QEMU_COMPUTE_VM_IP && \
148-
crudini --del $ANSWERS_FILE general CONFIG_NOVA_NETWORK_HOST && \
149-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_L3_HOSTS $NETWORK_VM_IP && \
150-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_DHCP_HOSTS $NETWORK_VM_IP && \
151-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_METADATA_HOSTS $NETWORK_VM_IP && \
152-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_TENANT_NETWORK_TYPE vlan && \
153-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_VLAN_RANGES physnet1:1000:2000 && \
154-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_BRIDGE_MAPPINGS physnet1:br-eth1 && \
155-
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_BRIDGE_IFACES br-eth1:eth1"
140+
crudini --del $ANSWERS_FILE general CONFIG_NOVA_NETWORK_HOST"
141+
142+
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
143+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "\
144+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_L3_HOSTS $NETWORK_VM_IP && \
145+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_DHCP_HOSTS $NETWORK_VM_IP && \
146+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_METADATA_HOSTS $NETWORK_VM_IP && \
147+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_TENANT_NETWORK_TYPE vlan && \
148+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_VLAN_RANGES physnet1:1000:2000 && \
149+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_BRIDGE_MAPPINGS physnet1:br-eth1 && \
150+
crudini --set $ANSWERS_FILE general CONFIG_QUANTUM_OVS_BRIDGE_IFACES br-eth1:eth1"
151+
else
152+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "\
153+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_L3_HOSTS $NETWORK_VM_IP && \
154+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_DHCP_HOSTS $NETWORK_VM_IP && \
155+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_METADATA_HOSTS $NETWORK_VM_IP && \
156+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE vlan && \
157+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_OVS_VLAN_RANGES physnet1:1000:2000 && \
158+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS physnet1:br-eth1 && \
159+
crudini --set $ANSWERS_FILE general CONFIG_NEUTRON_OVS_BRIDGE_IFACES br-eth1:eth1"
160+
fi
156161

157162
echo "Deploying SSH private key on $CONTROLLER_VM_IP"
158163

@@ -166,8 +171,13 @@ run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "packstack --answer-file=$AN
166171
echo "Disabling Nova API rate limits"
167172
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "crudini --set $NOVA_CONF_FILE DEFAULT api_rate_limit False"
168173

169-
echo "Enabling Quantum firewall driver on controller"
170-
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "sed -i 's/^#\ firewall_driver/firewall_driver/g' /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini && service quantum-server restart"
174+
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
175+
echo "Enabling Quantum firewall driver on controller"
176+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "sed -i 's/^#\ firewall_driver/firewall_driver/g' /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini && service quantum-server restart"
177+
else
178+
echo "Enabling Neutron firewall driver on controller"
179+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "sed -i 's/^#\ firewall_driver/firewall_driver/g' /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini && service neutron-server restart"
180+
fi
171181

172182
echo "Set libvirt_type on QEMU/KVM compute node"
173183
run_ssh_cmd_with_retry $RDO_ADMIN@$QEMU_COMPUTE_VM_IP "grep vmx /proc/cpuinfo > /dev/null && crudini --set $NOVA_CONF_FILE DEFAULT libvirt_type kvm || true"
@@ -178,7 +188,7 @@ run_ssh_cmd_with_retry $RDO_ADMIN@$NETWORK_VM_IP "ovs-vsctl list-ports br-ex | g
178188

179189
install_3x_kernel () {
180190
SSHUSER_HOST=$1
181-
run_ssh_cmd_with_retry $SSHUSER_HOST "yum install -y centos-release-xen && yum update -y --disablerepo=* --enablerepo=Xen4CentOS kernel"
191+
run_ssh_cmd_with_retry $SSHUSER_HOST "yum install -y centos-release-xen && yum update -y --disablerepo=* --enablerepo=Xen4CentOS kernel"
182192
}
183193

184194
#echo "Installing 3.x kernel on network and compute nodes"
@@ -188,16 +198,31 @@ install_3x_kernel () {
188198

189199
GLANCE_HOST=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP general CONFIG_GLANCE_HOST $ANSWERS_FILE`
190200
QPID_HOST=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP general CONFIG_QPID_HOST $ANSWERS_FILE`
191-
QUANTUM_ADMIN_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP general CONFIG_QUANTUM_KS_PW $ANSWERS_FILE`
192-
193201
QPID_USERNAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT qpid_username $NOVA_CONF_FILE`
194202
QPID_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT qpid_password $NOVA_CONF_FILE`
195203

196-
QUANTUM_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_url $NOVA_CONF_FILE`
197-
QUANTUM_ADMIN_AUTH_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_admin_auth_url $NOVA_CONF_FILE`
198-
QUANTUM_ADMIN_TENANT_NAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_admin_tenant_name $NOVA_CONF_FILE`
204+
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
205+
NEUTRON_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_url $NOVA_CONF_FILE`
206+
NEUTRON_ADMIN_AUTH_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_admin_auth_url $NOVA_CONF_FILE`
207+
NEUTRON_ADMIN_TENANT_NAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT quantum_admin_tenant_name $NOVA_CONF_FILE`
208+
NEUTRON_ADMIN_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP general CONFIG_QUANTUM_KS_PW $ANSWERS_FILE`
209+
210+
NEUTRON_ADMIN_USERNAME=quantum
211+
else
212+
NEUTRON_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_url $NOVA_CONF_FILE`
213+
NEUTRON_ADMIN_AUTH_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_auth_url $NOVA_CONF_FILE`
214+
NEUTRON_ADMIN_TENANT_NAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_tenant_name $NOVA_CONF_FILE`
215+
NEUTRON_ADMIN_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP general CONFIG_NEUTRON_KS_PW $ANSWERS_FILE`
216+
217+
CEILOMETER_ADMIN_AUTH_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT os_auth_url $CEILOMETER_CONF_FILE`
218+
CEILOMETER_ADMIN_TENANT_NAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT os_tenant_name $CEILOMETER_CONF_FILE`
219+
CEILOMETER_ADMIN_USERNAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT os_username $CEILOMETER_CONF_FILE`
220+
CEILOMETER_ADMIN_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT os_password $CEILOMETER_CONF_FILE`
221+
CEILOMETER_METERING_SECRET=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT metering_secret $CEILOMETER_CONF_FILE`
222+
223+
NEUTRON_ADMIN_USERNAME=neutron
224+
fi
199225

200-
QUANTUM_ADMIN_USERNAME=quantum
201226
GLANCE_PORT=9292
202227
QPID_PORT=5672
203228

@@ -212,8 +237,12 @@ wait_for_listening_port $HYPERV_COMPUTE_VM_IP 5986 $MAX_WAIT_SECONDS
212237

213238
HYPERV_VSWITCH_NAME=external
214239
RPC_BACKEND=ApacheQpid
215-
216-
$BASEDIR/deploy-hyperv-compute.sh $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD $OPENSTACK_RELEASE $HYPERV_VSWITCH_NAME $GLANCE_HOST $RPC_BACKEND $QPID_HOST $QPID_USERNAME $QPID_PASSWORD $QUANTUM_URL $QUANTUM_ADMIN_AUTH_URL $QUANTUM_ADMIN_TENANT_NAME $QUANTUM_ADMIN_USERNAME $QUANTUM_ADMIN_PASSWORD
240+
241+
$BASEDIR/deploy-hyperv-compute.sh $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD $OPENSTACK_RELEASE \
242+
$HYPERV_VSWITCH_NAME $GLANCE_HOST $RPC_BACKEND $QPID_HOST $QPID_USERNAME $QPID_PASSWORD $NEUTRON_URL \
243+
$NEUTRON_ADMIN_AUTH_URL $NEUTRON_ADMIN_TENANT_NAME $NEUTRON_ADMIN_USERNAME $NEUTRON_ADMIN_PASSWORD \
244+
$CEILOMETER_ADMIN_AUTH_URL $CEILOMETER_ADMIN_TENANT_NAME $CEILOMETER_ADMIN_USERNAME $CEILOMETER_ADMIN_PASSWORD \
245+
$CEILOMETER_METERING_SECRET
217246

218247
echo "Wait for reboot"
219248
sleep 120
@@ -229,11 +258,18 @@ wait_for_listening_port $CONTROLLER_VM_IP 22 $MAX_WAIT_SECONDS
229258

230259
#sleep 5
231260

261+
#run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "echo 120 > /proc/sys/kernel/softlockup_thresh"
262+
232263
echo "Validating Nova configuration"
233264
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "source ./keystonerc_admin && nova service-list | sed -e '$d' | awk '(NR > 3) {print $10}' | sed -rn '/down/q1'" 10
234265

235-
echo "Validating Quantum configuration"
236-
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "source ./keystonerc_admin && quantum agent-list -f csv | sed -e '1d' | sed -rn 's/\".*\",\".*\",\".*\",\"(.*)\",.*/\1/p' | sed -rn '/xxx/q1'" 10
266+
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
267+
echo "Validating Quantum configuration"
268+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "source ./keystonerc_admin && quantum agent-list -f csv | sed -e '1d' | sed -rn 's/\".*\",\".*\",\".*\",\"(.*)\",.*/\1/p' | sed -rn '/xxx/q1'" 10
269+
else
270+
echo "Validating Neutron configuration"
271+
run_ssh_cmd_with_retry $RDO_ADMIN@$CONTROLLER_VM_IP "source ./keystonerc_admin && neutron agent-list -f csv | sed -e '1d' | sed -rn 's/\".*\",\".*\",\".*\",\"(.*)\",.*/\1/p' | sed -rn '/xxx/q1'" 10
272+
fi
237273

238274
echo "RDO installed!"
239275
echo "Controller IP: $CONTROLLER_VM_IP"

‎deploy-hyperv-compute.sh

+27-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#!/bin/bash
22
set -e
33

4-
if [ $# -ne 15 ]; then
5-
echo "Usage: $0 <hyperv_host_ip> <hyperv_admin_username> <hyperv_password> <openstack_release> <vswitch_name> <glance_host> <rpc_backend> <rpc_backend_host> <rpc_backend_username> <rpc_backend_password> <quantum_url> <quantum_admin_auth_url> <quantum_admin_tenant_name> <quantum_admin_username> <quantum_admin_password>"
4+
if [ $# -ne 20 ]; then
5+
echo "Usage: $0 <hyperv_host_ip> <hyperv_admin_username> <hyperv_password> <openstack_release> <vswitch_name> <glance_host> \
6+
<rpc_backend> <rpc_backend_host> <rpc_backend_username> <rpc_backend_password> <quantum_url> \
7+
<quantum_admin_auth_url> <quantum_admin_tenant_name> <quantum_admin_username> <quantum_admin_password> \
8+
<ceilometer_admin_auth_url> <ceilometer_admin_tenant_name> <ceilometer_admin_username> <ceilometer_admin_password> \
9+
<ceilometer_metering_secret>"
610
exit 1
711
fi
812

@@ -21,6 +25,11 @@ QUANTUM_ADMIN_AUTH_URL=${12}
2125
QUANTUM_ADMIN_TENANT_NAME=${13}
2226
QUANTUM_ADMIN_USERNAME=${14}
2327
QUANTUM_ADMIN_PASSWORD=${15}
28+
CEILOMETER_ADMIN_AUTH_URL=${16}
29+
CEILOMETER_ADMIN_TENANT_NAME=${17}
30+
CEILOMETER_ADMIN_USERNAME=${18}
31+
CEILOMETER_ADMIN_PASSWORD=${19}
32+
CEILOMETER_METERING_SECRET=${20}
2433

2534
GLANCE_PORT=9292
2635
RPC_BACKEND_PORT=5672
@@ -46,6 +55,8 @@ fi
4655

4756
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
4857
MSI_FILE=HyperVNovaCompute_Grizzly.msi
58+
elif [ "$OPENSTACK_RELEASE" == "havana" ]; then
59+
MSI_FILE=HyperVNovaCompute_Havana.msi
4960
elif [ "$OPENSTACK_RELEASE" == "master" ]; then
5061
MSI_FILE=HyperVNovaCompute_Beta.msi
5162
else
@@ -67,13 +78,19 @@ echo "Installing Hyper-V OpenStack Compute on $HYPERV_COMPUTE_VM_IP"
6778

6879
if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
6980
run_wsmancmd_with_retry $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD "msiexec /i %TEMP%\\$MSI_FILE /qn /l*v %TEMP%\\HyperVNovaCompute_setup_log.txt \
70-
ADDLOCAL=HyperVNovaCompute,QuantumHyperVAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT \
71-
RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
72-
VERBOSELOGGING=1 QUANTUMURL=$QUANTUM_URL QUANTUMADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME QUANTUMADMINUSERNAME=$QUANTUM_ADMIN_USERNAME QUANTUMADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD QUANTUMADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL"
81+
ADDLOCAL=HyperVNovaCompute,QuantumHyperVAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
82+
RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD \
83+
INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
84+
VERBOSELOGGING=1 QUANTUMURL=$QUANTUM_URL QUANTUMADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME QUANTUMADMINUSERNAME=$QUANTUM_ADMIN_USERNAME \
85+
QUANTUMADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD QUANTUMADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL"
7386
else
7487
run_wsmancmd_with_retry $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD "msiexec /i %TEMP%\\$MSI_FILE /qn /l*v %TEMP%\\HyperVNovaCompute_setup_log.txt \
75-
ADDLOCAL=HyperVNovaCompute,NeutronHyperVAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT \
76-
RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
77-
VERBOSELOGGING=1 NEUTRONURL=$QUANTUM_URL NEUTRONADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME NEUTRONADMINUSERNAME=$QUANTUM_ADMIN_USERNAME NEUTRONADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD NEUTRONADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL"
78-
fi
79-
88+
ADDLOCAL=HyperVNovaCompute,NeutronHyperVAgent,CeilometerComputeAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
89+
RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD \
90+
INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
91+
VERBOSELOGGING=1 NEUTRONURL=$QUANTUM_URL NEUTRONADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME NEUTRONADMINUSERNAME=$QUANTUM_ADMIN_USERNAME \
92+
NEUTRONADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD NEUTRONADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL \
93+
CEILOMETERADMINTENANTNAME=$CEILOMETER_ADMIN_TENANT_NAME CEILOMETERADMINUSERNAME=$CEILOMETER_ADMIN_USERNAME \
94+
CEILOMETERADMINPASSWORD=$CEILOMETER_ADMIN_PASSWORD CEILOMETERADMINAUTHURL=$CEILOMETER_ADMIN_AUTH_URL \
95+
CEILOMETERMETERINGSECRET=$CEILOMETER_METERING_SECRET"
96+
fi

0 commit comments

Comments
 (0)