added ssl support based on default.

[joid.git] / ci / config_tpl / juju2 / deployconfig.yaml

diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 0f39386..2d59b88 100644 (file)
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -1,8 +1,17 @@
+opnfv-{{ lab.location }}{{ lab.racks[0].rack }}-maas:
 opnfv:
+{% if opnfv.spaces_dict.osapi is defined %}
+{% set net_prefix = opnfv.spaces_dict.osapi.cidr[:-4] %}
+{% else %}
 {% set net_prefix = opnfv.spaces_dict.admin.cidr[:-4] %}
+{% endif %}
   admNetgway: {{ opnfv.spaces_dict.admin.gateway }}
   admNetwork: {{ net_prefix }}2
   admin_password: openstack
+  ip_address: {{ os.brAdmIP }}
+  maas_name: {{ lab.location }}{{ lab.racks[0].rack }}
+  main_archive: http://archive.ubuntu.com/ubuntu
+  upstream_dns: {{ lab.racks[0].dns }}
 {% if opnfv.storage_dict.ceph is defined %}
   ceph-disk: {{ opnfv.storage_dict.ceph.disk }}
 {% endif %}
@@ -10,15 +19,13 @@ opnfv:
 {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %}
   dataNetwork: {{ opnfv.spaces_dict.data.cidr }}
 {% endif %}
-  domain: {{ lab.racks[0].osdomainname }}
   ext-port: {{ lab.racks[0]['ext-port'] }}
   ext_port: {{ lab.racks[0]['ext-port'] }}
   floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }}
   interface-enable: {{ lab.racks[0].ifnamelist }}
-  os-domain-name: {{ lab.racks[0].osdomainname }}
 {% if opnfv.spaces_dict.public is defined %}
-{% set netpublic_prefix = opnfv.spaces_dict.mgmt.cidr[:-4] %}
-  publicNetwork: {{ opnfv.spaces_dict.mgmt.cidr }}
+{% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %}
+  publicNetwork: {{ opnfv.spaces_dict.public.cidr }}
 {% endif %}
   spaces:
 {% for net in opnfv.spaces %}
@@ -38,36 +45,33 @@ opnfv:
 {% endif %}
   units: {{ lab.racks[0].nodes|count }}
   vip:
-{% if opnfv.spaces_dict.mgmt is defined %}
-{% if opnfv.spaces_dict.data is defined %}
-    ceilometer: {{ net_prefix }}24 {{ netdata_prefix }}24 {{ netpublic_prefix }}24
-    cinder: {{ net_prefix }}29 {{ netdata_prefix }}29 {{ netpublic_prefix }}29
-    dashboard: {{ net_prefix }}21 {{ netdata_prefix }}21 {{ netpublic_prefix }}21
-    glance: {{ net_prefix }}22 {{ netdata_prefix }}22 {{ netpublic_prefix }}22
-    heat: {{ net_prefix }}28 {{ netdata_prefix }}28 {{ netpublic_prefix }}28
-    keystone: {{ net_prefix }}23 {{ netdata_prefix }}23 {{ netpublic_prefix }}23
-    mysql: {{ net_prefix }}25
-    neutron: {{ net_prefix }}27 {{ netdata_prefix }}27 {{ netpublic_prefix }}27
-    nova: {{ net_prefix }}26 {{ netdata_prefix }}27 {{ netpublic_prefix }}26
-{% else %}
-    ceilometer: {{ net_prefix }}24 {{ netpublic_prefix }}24
-    cinder: {{ net_prefix }}29 {{ netpublic_prefix }}29
-    dashboard: {{ net_prefix }}21 {{ netpublic_prefix }}21
-    glance: {{ net_prefix }}22 {{ netpublic_prefix }}22
-    heat: {{ net_prefix }}28 {{ netpublic_prefix }}28
-    keystone: {{ net_prefix }}23 {{ netpublic_prefix }}23
+{% if opnfv.spaces_dict.public is defined %}
+    aodh: {{ netpublic_prefix }}33 {{ net_prefix }}33
+    ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24
+    cinder: {{ netpublic_prefix }}29 {{ net_prefix }}29
+    dashboard: {{ netpublic_prefix }}21 {{ net_prefix }}21
+    designate: {{ netpublic_prefix }}32 {{ net_prefix }}32
+    glance: {{ netpublic_prefix }}22 {{ net_prefix }}22
+    gnocchi: {{ netpublic_prefix }}31 {{ net_prefix }}31
+    heat: {{ netpublic_prefix }}28 {{ net_prefix }}28
+    keystone: {{ netpublic_prefix }}23 {{ net_prefix }}23
     mysql: {{ net_prefix }}25
-    neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27
-    nova: {{ net_prefix }}26 {{ netpublic_prefix }}26
-{% endif %}
+    neutron: {{ netpublic_prefix }}27 {{ net_prefix }}27
+    nova: {{ netpublic_prefix }}26 {{ net_prefix }}26
+    radosgw: {{ netpublic_prefix }}30 {{ net_prefix }}30
 {% else %}
+    aodh: {{ net_prefix }}33
     ceilometer: {{ net_prefix }}24
     cinder: {{ net_prefix }}29
     dashboard: {{ net_prefix }}21
+    designate: {{ net_prefix }}32
     glance: {{ net_prefix }}22
+    gnocchi: {{ net_prefix }}31
     heat: {{ net_prefix }}28
     keystone: {{ net_prefix }}23
     mysql: {{ net_prefix }}25
     neutron: {{ net_prefix }}27
     nova: {{ net_prefix }}26
+    radosgw: {{ net_prefix }}30
 {% endif %}
+