Deployment tasks added for vmware-compute nodes
- dvs-related nova patch applied - openstack-network-compute task added Change-Id: Ia8e2f56a493ef4a26ce9c36893b253439c0985c3
This commit is contained in:
parent
9fc3dd4fd6
commit
152cf6a541
|
@ -3,6 +3,7 @@
|
||||||
plugin_name=fuel-plugin-vmware-dvs
|
plugin_name=fuel-plugin-vmware-dvs
|
||||||
plugin_version=1.1
|
plugin_version=1.1
|
||||||
ip=`hiera master_ip`
|
ip=`hiera master_ip`
|
||||||
|
role=`hiera role`
|
||||||
port=8080
|
port=8080
|
||||||
_hostname=$(hostname)
|
_hostname=$(hostname)
|
||||||
|
|
||||||
|
@ -22,9 +23,19 @@ function _restart_crm_resource {
|
||||||
function _nova_patch {
|
function _nova_patch {
|
||||||
wget -O /usr/lib/python2.7/dist-packages/nova.patch "http://$ip:$port/plugins/$plugin_name-$plugin_version/nova.patch" && cd /usr/lib/python2.7/dist-packages/ ; patch -N -p1 < nova.patch
|
wget -O /usr/lib/python2.7/dist-packages/nova.patch "http://$ip:$port/plugins/$plugin_name-$plugin_version/nova.patch" && cd /usr/lib/python2.7/dist-packages/ ; patch -N -p1 < nova.patch
|
||||||
sed -i s/neutron_url_timeout=.*/neutron_url_timeout=3600/ /etc/nova/nova.conf
|
sed -i s/neutron_url_timeout=.*/neutron_url_timeout=3600/ /etc/nova/nova.conf
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function _restart_nova {
|
||||||
for resource in $(crm_mon -1|awk '/nova_compute_vmware/ {print $1}'); do
|
for resource in $(crm_mon -1|awk '/nova_compute_vmware/ {print $1}'); do
|
||||||
_restart_crm_resource $resource
|
_restart_crm_resource $resource
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
_nova_patch
|
_nova_patch
|
||||||
|
if [ "$role" = "primary-controller" ] || [ "$role" = "controller" ];
|
||||||
|
then
|
||||||
|
_restart_nova
|
||||||
|
else
|
||||||
|
service nova-compute restart
|
||||||
|
fi
|
||||||
|
|
|
@ -14,6 +14,29 @@
|
||||||
parameters:
|
parameters:
|
||||||
cmd: ./install_the_driver.sh 2>&1 | tee -a /tmp/ins_the_drivers.log
|
cmd: ./install_the_driver.sh 2>&1 | tee -a /tmp/ins_the_drivers.log
|
||||||
timeout: 720
|
timeout: 720
|
||||||
|
- id: install-the-driver-compute
|
||||||
|
type: shell
|
||||||
|
role: [compute-vmware]
|
||||||
|
required_for: [post_deployment_end]
|
||||||
|
requires: ['delete-predefined-networks']
|
||||||
|
condition: "settings:common.use_vcenter.value == true"
|
||||||
|
parameters:
|
||||||
|
cmd: ./install_the_driver.sh 2>&1 | tee -a /tmp/ins_the_drivers.log
|
||||||
|
timeout: 720
|
||||||
|
- id: openstack-network-vmware-compute
|
||||||
|
type: puppet
|
||||||
|
role: [compute-vmware]
|
||||||
|
required_for: [post_deployment_end]
|
||||||
|
requires: ['install-the-driver-compute']
|
||||||
|
condition: "settings:common.use_vcenter.value == true"
|
||||||
|
parameters:
|
||||||
|
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-compute.pp
|
||||||
|
puppet_modules: /etc/puppet/modules
|
||||||
|
timeout: 3600
|
||||||
|
test_pre:
|
||||||
|
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-compute_pre.rb
|
||||||
|
test_post:
|
||||||
|
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-compute_post.rb
|
||||||
- id: setup-neutron-plugin
|
- id: setup-neutron-plugin
|
||||||
role: ['primary-controller','controller']
|
role: ['primary-controller','controller']
|
||||||
required_for: [post_deployment_end]
|
required_for: [post_deployment_end]
|
||||||
|
|
Loading…
Reference in New Issue