Browse Source

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
Aleksandr Didenko 3 years ago
parent
commit
47d20c9c22

+ 1304
- 0
hiera/neut_tun.murano.sahara.ceil.public_ssl-ceph-osd.yaml
File diff suppressed because it is too large
View File


+ 1373
- 0
hiera/neut_tun.murano.sahara.ceil.public_ssl-compute.yaml
File diff suppressed because it is too large
View File


+ 2039
- 0
hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 1285
- 0
hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 18
- 0
utils/generate_yamls.sh View File

@@ -70,6 +70,16 @@ function enable_nova_quota {
70 70
   fuel env --attributes --env $1 --upload
71 71
 }
72 72
 
73
+function enable_public_ssl {
74
+  fuel env --attributes --env $1 --download
75
+  ruby -ryaml -e '
76
+  attr = YAML.load(File.read(ARGV[0]))
77
+  attr["editable"]["public_ssl"]["services"]["value"] = true
78
+  attr["editable"]["public_ssl"]["horizon"]["value"] = true
79
+  File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
80
+  fuel env --attributes --env $1 --upload
81
+}
82
+
73 83
 function enable_vms_conf {
74 84
   virt_node_ids=`fuel nodes --env $1 2>/dev/null | grep virt | awk '{print $1}'`
75 85
   for id in $virt_node_ids ; do
@@ -120,6 +130,9 @@ function generate_yamls {
120 130
   if [ "${name/dvr}" != "$name" ] ; then
121 131
     enable_neutron_dvr $env
122 132
   fi
133
+  if [ "${name/public_ssl}" != "$name" ] ; then
134
+    enable_public_ssl $env
135
+  fi
123 136
 
124 137
   for id in `list_free_nodes` ; do
125 138
     if ! [ -z "${roles[0]}" ] ; then
@@ -180,3 +193,8 @@ clean_env 'test_neutron_tun'
180 193
 fuel env --create --name test_neutron_tun --rel 2 --net tun
181 194
 generate_yamls 'test_neutron_tun' 'neut_tun.vms_conf' 'virt compute' 'virt'
182 195
 clean_env 'test_neutron_tun'
196
+
197
+# Neutron tun, addons, ceph, public and hotizon ssl
198
+fuel env --create --name test_neutron_tun --rel 2 --net tun
199
+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'
200
+clean_env 'test_neutron_tun'

Loading…
Cancel
Save