Actual fixtures for VMware and up generate script
- provide actual yaml fixtures for VMware (iso 352) - add VMware case for generate_yamls.sh - fix admin_net_tpl, list_free_nodes, save_yamls, clean_env functions Change-Id: I7202b964beceae148a853c1c055dea6b259a3f69 Partial-Bug: 1541849 Related-Bug: 1535339
This commit is contained in:
parent
e99a094b98
commit
3b9b77cdce
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -6,7 +6,7 @@
|
|||
|
||||
CWD=$(cd `dirname $0` && pwd -P)
|
||||
|
||||
mkdir ./yamls
|
||||
mkdir -p ./yamls
|
||||
rm -f ./yamls/*
|
||||
|
||||
function generate_fake_nodes_fixtures {
|
||||
|
@ -54,7 +54,6 @@ function enable_ceph {
|
|||
attr["editable"]["storage"]["auth_s3_keystone_ceph"]["value"] = true
|
||||
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||
fuel env --attributes --env $1 --upload
|
||||
rm -rf "cluster_$1"
|
||||
}
|
||||
|
||||
function enable_cblock {
|
||||
|
@ -64,7 +63,6 @@ function enable_cblock {
|
|||
attr["editable"]["storage"]["volumes_block_device"]["value"] = true
|
||||
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||
fuel env --attributes --env $1 --upload
|
||||
rm -rf "cluster_$1"
|
||||
}
|
||||
|
||||
function enable_murano_sahara_ceilometer {
|
||||
|
@ -105,6 +103,74 @@ function enable_neutron_dvr {
|
|||
fuel env --attributes --env $1 --upload
|
||||
}
|
||||
|
||||
function enable_vcenter {
|
||||
fuel env --attributes --env $1 --download
|
||||
ruby -ryaml -e '
|
||||
attr = YAML.load(File.read(ARGV[0]))
|
||||
attr["editable"]["common"]["use_vcenter"]["value"] = true
|
||||
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||
fuel env --attributes --env $1 --upload
|
||||
}
|
||||
|
||||
function enable_vcenter_glance {
|
||||
fuel env --attributes --env $1 --download
|
||||
ruby -ryaml -e '
|
||||
attr = YAML.load(File.read(ARGV[0]))
|
||||
attr["editable"]["storage"]["images_vcenter"]["value"] = true
|
||||
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||
fuel env --attributes --env $1 --upload
|
||||
}
|
||||
|
||||
function vmware_settings {
|
||||
compute_vmware=$2
|
||||
fuel --env $1 vmware-settings --download
|
||||
ruby -ryaml -e '
|
||||
vmware = YAML.load(File.read(ARGV[0]))
|
||||
vcenter_cred = {
|
||||
"vcenter_host"=>"172.16.0.254", "vcenter_password"=>"Qwer!1234",
|
||||
"vcenter_username"=>"administrator@vsphere.local"
|
||||
}
|
||||
vmware["editable"]["value"]["availability_zones"][0].merge! vcenter_cred
|
||||
File.open(ARGV[0], "w").write(vmware.to_yaml)' "vmware_settings_$1.yaml"
|
||||
if [ "$compute_vmware" = "compute-vmware" ]; then
|
||||
env_id=`envid $1`
|
||||
node_id=$(list_free_nodes | sed -n '1p')
|
||||
fuel --env $env_id node set --node $node_id --role compute-vmware
|
||||
ruby -ryaml -e '
|
||||
$compute_vmware_node = ARGV[1]
|
||||
puts $compute_vmware_node
|
||||
vmware = YAML.load(File.read(ARGV[0]))
|
||||
vmware_computes = {
|
||||
"datastore_regex"=>".*", "service_name"=>"vm_cluster1",
|
||||
"target_node"=>{"current"=>{"id"=>$compute_vmware_node,
|
||||
"label"=>$compute_vmware_node}, "options"=>[{"id"=>"controllers",
|
||||
"label"=>"controllers"}, {"id"=>$compute_vmware_node,
|
||||
"label"=>$compute_vmware_node}]}, "vsphere_cluster"=>"Cluster1"
|
||||
}
|
||||
vmware["editable"]["value"]["availability_zones"][0]["nova_computes"][0].merge! vmware_computes
|
||||
File.open(ARGV[0], "w").write(vmware.to_yaml)' "vmware_settings_$1.yaml" "node-$node_id"
|
||||
else
|
||||
ruby -ryaml -e '
|
||||
vmware = YAML.load(File.read(ARGV[0]))
|
||||
vmware_computes = {
|
||||
"datastore_regex"=>".*", "service_name"=>"vm_cluster1",
|
||||
"target_node"=>{"current"=>{"id"=>"controllers",
|
||||
"label"=>"controllers"}, "options"=>[{"id"=>"controllers",
|
||||
"label"=>"controllers"}]}, "vsphere_cluster"=>"Cluster1"
|
||||
}
|
||||
vmware_glance = {
|
||||
"ca_file"=>{"content"=>"RSA", "name"=>"vcenter-ca.pem"},
|
||||
"datacenter"=>"Datacenter", "datastore"=>"nfs",
|
||||
"vcenter_host"=>"172.16.0.254", "vcenter_password"=>"Qwer!1234",
|
||||
"vcenter_username"=>"administrator@vsphere.local"
|
||||
}
|
||||
vmware["editable"]["value"]["availability_zones"][0]["nova_computes"][0].merge! vmware_computes
|
||||
vmware["editable"]["value"]["glance"].merge! vmware_glance
|
||||
File.open(ARGV[0], "w").write(vmware.to_yaml)' "vmware_settings_$1.yaml"
|
||||
fi
|
||||
fuel --env $1 vmware-settings --upload
|
||||
}
|
||||
|
||||
function enable_nova_quota {
|
||||
fuel env --attributes --env $1 --download
|
||||
ruby -ryaml -e '
|
||||
|
@ -141,8 +207,8 @@ function list_free_nodes {
|
|||
}
|
||||
|
||||
function save_yamls {
|
||||
envid=`fuel env | grep $1 | awk '{print $1}'`
|
||||
fuel deployment --default --env $envid 2>/dev/null
|
||||
env=`envid $1`
|
||||
fuel deployment --default --env $env 2>/dev/null
|
||||
}
|
||||
|
||||
function envid {
|
||||
|
@ -196,6 +262,15 @@ function generate_yamls {
|
|||
if [ "${name/dvr}" != "$name" ] ; then
|
||||
enable_neutron_dvr $env
|
||||
fi
|
||||
if [ "${name/vmware.glance}" != "$name" ] ; then
|
||||
enable_vcenter $env
|
||||
enable_vcenter_glance $env
|
||||
vmware_settings $env
|
||||
fi
|
||||
if [ "${name/vmware.cinder-vmware.compute-vmware}" != "$name" ] ; then
|
||||
enable_vcenter $env
|
||||
vmware_settings $env compute-vmware
|
||||
fi
|
||||
if [ "${name/public_ssl}" != "$name" ] ; then
|
||||
enable_public_ssl $env
|
||||
fi
|
||||
|
@ -236,8 +311,9 @@ function clean_env {
|
|||
fuel env --delete --env $env
|
||||
rm -rf "cluster_$env"
|
||||
rm -rf "deployment_$env"
|
||||
rm -rf "vmware_settings_$env.yaml"
|
||||
rm -f network_${env}.yaml
|
||||
sleep 80
|
||||
sleep 60
|
||||
fi
|
||||
clean_fake_nodes
|
||||
}
|
||||
|
@ -245,7 +321,6 @@ function clean_env {
|
|||
function add_nodegroup {
|
||||
env=`envid $1`
|
||||
name=$2
|
||||
|
||||
fuel --env $env nodegroup --create --name $name
|
||||
}
|
||||
|
||||
|
@ -281,6 +356,16 @@ fuel env --create --name test_neutron_vlan --rel 2 --net vlan
|
|||
generate_yamls 'test_neutron_vlan' 'neut_vlan.dvr' 'controller controller controller' 'primary-controller'
|
||||
clean_env 'test_neutron_vlan'
|
||||
|
||||
# Neutron vlan VMware vCenter + VMware Glance
|
||||
fuel env --create --name test_neutron_vlan --rel 2 --net vlan
|
||||
generate_yamls 'test_neutron_vlan' 'neut_vlan.vmware.glance' 'controller controller controller' 'primary-controller'
|
||||
clean_env 'test_neutron_vlan'
|
||||
|
||||
# Neutron vlan VMware vCenter + cinder-vmware + compute-vmware
|
||||
fuel env --create --name test_neutron_vlan --rel 2 --net vlan
|
||||
generate_yamls 'test_neutron_vlan' 'neut_vlan.vmware.cinder-vmware.compute-vmware' 'controller controller controller cinder-vmware' 'primary-controller compute-vmware cinder-vmware'
|
||||
clean_env 'test_neutron_vlan'
|
||||
|
||||
# Neutron tun addons + ceph
|
||||
fuel env --create --name test_neutron_tun --rel 2 --net tun
|
||||
generate_yamls 'test_neutron_tun' 'neut_tun.ceph.murano.sahara.ceil' 'controller controller compute ceph-osd ceph-osd mongo mongo' 'primary-controller controller compute ceph-osd primary-mongo mongo'
|
||||
|
|
Loading…
Reference in New Issue