Add fixtures with public and horizon SSL
- Update script to generate fixtures with public/horizon SSL enabled - Add fixtures with public/horizon SSL enabled Partial-bug: #1535339 Implements: blueprint deployment-dryrun-fixtures-generator Change-Id: I61d59f9ce4f1f8928ca30ab62cd815e9185486eb
This commit is contained in:
parent
8de54cce38
commit
47d20c9c22
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
|
@ -70,6 +70,16 @@ function enable_nova_quota {
|
|||
fuel env --attributes --env $1 --upload
|
||||
}
|
||||
|
||||
function enable_public_ssl {
|
||||
fuel env --attributes --env $1 --download
|
||||
ruby -ryaml -e '
|
||||
attr = YAML.load(File.read(ARGV[0]))
|
||||
attr["editable"]["public_ssl"]["services"]["value"] = true
|
||||
attr["editable"]["public_ssl"]["horizon"]["value"] = true
|
||||
File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
|
||||
fuel env --attributes --env $1 --upload
|
||||
}
|
||||
|
||||
function enable_vms_conf {
|
||||
virt_node_ids=`fuel nodes --env $1 2>/dev/null | grep virt | awk '{print $1}'`
|
||||
for id in $virt_node_ids ; do
|
||||
|
@ -120,6 +130,9 @@ function generate_yamls {
|
|||
if [ "${name/dvr}" != "$name" ] ; then
|
||||
enable_neutron_dvr $env
|
||||
fi
|
||||
if [ "${name/public_ssl}" != "$name" ] ; then
|
||||
enable_public_ssl $env
|
||||
fi
|
||||
|
||||
for id in `list_free_nodes` ; do
|
||||
if ! [ -z "${roles[0]}" ] ; then
|
||||
|
@ -180,3 +193,8 @@ clean_env 'test_neutron_tun'
|
|||
fuel env --create --name test_neutron_tun --rel 2 --net tun
|
||||
generate_yamls 'test_neutron_tun' 'neut_tun.vms_conf' 'virt compute' 'virt'
|
||||
clean_env 'test_neutron_tun'
|
||||
|
||||
# Neutron tun, addons, ceph, public and hotizon ssl
|
||||
fuel env --create --name test_neutron_tun --rel 2 --net tun
|
||||
generate_yamls 'test_neutron_tun' 'neut_tun.murano.sahara.ceil.public_ssl' 'controller controller mongo mongo compute ceph-osd ceph-osd' 'primary-controller compute ceph-osd primary-mongo'
|
||||
clean_env 'test_neutron_tun'
|
||||
|
|
Loading…
Reference in New Issue