arif/openstack-lab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated heat and deployment script

Browse Source 
* Update Fn::Join commands to apply on lists
* update the nova.conf so that novncproxy_base_url is the public facing IP
* update vxlan script to also install/configure LBaaS

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>
This commit is contained in:
Arif Ali 2014-11-06 21:37:30 +00:00
parent 89fbc0e317
commit d0c68d0f94
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_templates/icehouse/hpc.yaml
View File

@ -229,9 +229,9 @@ resources:
# NB: For this to work you need a version of Heat that
# includes https://review.openstack.org/#/c/121139/
"$COMP_NODE_ADDRESSES":
"Fn::Join": [ ",", { get_attr: [compute_nodes, compute_node_ip] } ]
"Fn::Join": [ ",", [{ get_attr: [compute_nodes, compute_node_ip] }] ]
"$COMP_NODE_NAMES":
"Fn::Join": [ "," , { get_attr: [compute_nodes, compute_node_name] } ]
"Fn::Join": [ "," , [{ get_attr: [compute_nodes, compute_node_name] }] ]
"$WAIT_HANDLE":
get_resource: master_wait_handle
"$HOST_PREFIX":

6
scripts/vxlan-packstack.sh
View File

@ -19,6 +19,8 @@ s/\(CONFIG_USE_EPEL=\).*/\1n/g
s/\(CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS=\).*/\1physnet_mgmt:br-mgmt/g
s/\(CONFIG_NEUTRON_OVS_BRIDGE_IFACES=\).*/\1br-mgmt:enp2s1f0/g
s/\(CONFIG_PROVISION_DEMO=\).*/\1n/g
s/\(CONFIG_LBAAS_INSTALL=\).*/\1y/g
EOF
sed -i -f /tmp/sed.script /root/packstack_answers.txt
@ -56,6 +58,8 @@ crudini --set /etc/nova/nova.conf DEFAULT osapi_compute_ext_list nova.api.openst
crudini --set /etc/nova/nova.conf DEFAULT osapi_compute_extension nova.api.openstack.compute.contrib.standard_extensions
sed -i -e 's/^\(osapi_compute_extension.*\)/\1\nosapi_compute_extension = nova.api.openstack.compute.contrib.extended_server_attributes/g' /etc/nova/nova.conf
crudini --set /etc/nova/nova.conf DEFAULT novncproxy_base_url http://${PRIMARY_PUBIP}:6080/vnc_auto.html
openstack-service restart
#
@ -76,6 +80,8 @@ EOF
xdcp nova /tmp/sed.script /tmp/
xdsh nova sed -i -f /tmp/sed.script /etc/nova/nova.conf
xdsh nova crudini --set /etc/nova/nova.conf DEFAULT novncproxy_base_url http://${PRIMARY_PUBIP}:6080/vnc_auto.html
xdsh nova openstack-service restart
#
# End -- Do this on xCAT MN