Merge "Autodeployment adaptation to Fuel 7"

7 files changed, 923 insertions, 365 deletions

diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
index 30851ea43..fa787a41d 100644
--- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
@@ -4,10 +4,10 @@ version:
 created:
 comment: Config for Ericsson Montreal Lab - HA deployment with Ceph and Opendaylight
 environment:
-  name: opnfv
+  name: opnfv_virt
   mode: ha
-  net_segment_type: gre
-wanted_release: Juno on Ubuntu 14.04.1
+  net_segment_type: tun
+wanted_release: Kilo on Ubuntu 14.04
 nodes:
 - id: 1
   interfaces: interfaces_1
@@ -35,20 +35,22 @@ nodes:
   role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
+    cidr: 10.20.0.0/24
+    dhcp_gateway: 10.20.0.2
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
     ipaddress: 10.20.0.2
     netmask: 255.255.0.0
-    dhcp_pool_start: 10.20.0.3
-    dhcp_pool_end: 10.20.0.254
-  DNS_UPSTREAM: 10.118.32.193
   DNS_DOMAIN: opnfvericsson.ca
   DNS_SEARCH: opnfvericsson.ca
+  DNS_UPSTREAM: 10.118.32.193
   FUEL_ACCESS:
-    user: admin
     password: admin
-  HOSTNAME: opnfv
+    user: admin
+  HOSTNAME: opnfv_virt
   NTP1: 10.118.32.193
   NTP2: 10.118.34.193
-  NTP3:
+  NTP3: null
 interfaces_1:
   eth0:
   - fuelweb_admin
@@ -117,9 +119,10 @@ transformations_2:
     name: eth2.20
 network:
   management_vip: 192.168.0.2
-  management_vrouter_vip: 192.168.0.3
+  management_vrouter_vip: 192.168.0.1
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
+    configuration_template: null
     dns_nameservers:
     - 10.118.32.193
     floating_ranges:
@@ -131,7 +134,7 @@ network:
     internal_cidr: 192.168.111.0/24
     internal_gateway: 192.168.111.1
     net_l23_provider: ovs
-    segmentation_type: gre
+    segmentation_type: tun
     vlan_range:
     - 2022
     - 2023
@@ -160,24 +163,6 @@ network:
       vlan_start: null
     name: public
     vlan_start: null
-  - cidr: 192.168.2.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.2.2
-      - 192.168.2.254
-    meta:
-      assign_vip: 192.168.2.0/24
-      configurable: true
-      map_priority: 2
-      name: private
-      notation: cidr
-      render_addr_mask: private
-      render_type: cidr
-      seg_type: gre
-      use_gateway: false
-      vlan_start: 103
-    name: private
-    vlan_start: 20
   - cidr: 192.168.0.0/24
     gateway: null
     ip_ranges:
@@ -201,7 +186,7 @@ network:
   - cidr: 192.168.1.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.1.2
+    - - 192.168.1.1
       - 192.168.1.254
     meta:
       cidr: 192.168.1.0/24
@@ -212,9 +197,27 @@ network:
       render_addr_mask: storage
       render_type: cidr
       use_gateway: false
-      vlan_start: 102
+      vlan_start: 220
     name: storage
-    vlan_start: 220
+    vlan_start: 102
+  - cidr: 192.168.2.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.2.1
+      - 192.168.2.254
+    meta:
+      cidr: 192.168.2.0/24
+      configurable: true
+      map_priority: 2
+      name: private
+      notation: cidr
+      render_addr_mask: null
+      render_type: cidr
+      seg_type: tun
+      use_gateway: false
+      vlan_start: 103
+    name: private
+    vlan_start: 20
   - cidr: 10.20.0.0/16
     gateway: 10.20.0.2
     ip_ranges:
@@ -232,6 +235,35 @@ network:
     vlan_start: null
   public_vip: 10.118.34.220
   public_vrouter_vip: 10.118.34.221
+  vips:
+    management:
+      ipaddr: 192.168.0.2
+      namespace: haproxy
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    public:
+      ipaddr: 10.118.34.220
+      namespace: haproxy
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter:
+      ipaddr: 192.168.0.1
+      namespace: vrouter
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter_pub:
+      ipaddr: 10.118.34.221
+      namespace: vrouter
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
 settings:
   editable:
     access:
@@ -303,8 +335,6 @@ settings:
       murano:
         description: If selected, Murano component will be installed
         label: Install Murano
-        restrictions:
-        - cluster:net_provider != 'neutron'
         type: checkbox
         value: false
         weight: 20
@@ -387,6 +417,8 @@ settings:
         value: true
         weight: 50
       use_vcenter:
+        restrictions:
+        - condition: cluster:net_provider == 'nova_network'
         type: hidden
         value: false
         weight: 30
@@ -443,6 +475,8 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.mongo.value == false
+          message: Ceilometer and MongoDB are not enabled on the Additional Components
+            section
         weight: 20
       mongo_db_name:
         description: Mongo database name
@@ -488,15 +522,14 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value: 110.118.32.193, 10.118.34.193
+        value: 10.118.32.193, 10.118.34.193
         weight: 10
     kernel_params:
       kernel:
         description: Default kernel parameters
         label: Initial parameters
         type: text
-        value: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
-          nomodeset
+        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
         weight: 45
       metadata:
         label: Kernel parameters
@@ -507,6 +540,7 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.murano.value == false
+          message: Murano is not enabled on the Additional Components section
         weight: 20
       murano_repo_url:
         description: ''
@@ -514,6 +548,32 @@ settings:
         type: text
         value: http://storage.apps.openstack.org/
         weight: 10
+    neutron_advanced_configuration:
+      metadata:
+        label: Neutron Advanced Configuration
+        restrictions:
+        - action: hide
+          condition: cluster:net_provider != 'neutron'
+        weight: 45
+      neutron_dvr:
+        description: Enable Distributed Virtual Routers in Neutron
+        label: Neutron DVR
+        restrictions:
+        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
+            == false
+          : DVR requires L2 population to be enabled.
+        type: checkbox
+        value: false
+        weight: 20
+      neutron_l2_pop:
+        description: Enable L2 population mechanism in Neutron
+        label: Neutron L2 population
+        restrictions:
+        - action: hide
+          condition: networking_parameters:segmentation_type == 'vlan'
+        type: checkbox
+        value: false
+        weight: 10
     neutron_mellanox:
       metadata:
         enabled: true
@@ -560,19 +620,13 @@ settings:
     provision:
       metadata:
         label: Provision
+        restrictions:
+        - action: hide
+          condition: 'true'
         weight: 80
       method:
-        description: Which provision method to use for this cluster.
-        label: Provision method
-        type: radio
+        type: hidden
         value: image
-        values:
-        - data: image
-          description: Copying pre-built images on a disk.
-          label: Image
-        - data: cobbler
-          description: Install from scratch using anaconda or debian-installer.
-          label: (DEPRECATED) Classic (use anaconda or debian-installer)
     public_network_assignment:
       assign_to_all_nodes:
         description: When disabled, public network will be assigned to controllers only
@@ -586,6 +640,61 @@ settings:
         - action: hide
           condition: cluster:net_provider != 'neutron'
         weight: 50
+    public_ssl:
+      cert_data:
+        description: Certificate and private key data, concatenated into a single file
+        label: Certificate
+        restrictions:
+        - action: hide
+          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or (settings:public_ssl.horizon.value
+            == false and settings:public_ssl.services.value == false)
+        type: file
+        value: ''
+        weight: 40
+      cert_source:
+        description: From where we'll get certificate and private key
+        label: Select source for certificate
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: radio
+        value: self_signed
+        values:
+        - data: self_signed
+          description: Generate private key and certificate that will be signed by this
+            key
+          label: Self-signed
+        - data: user_uploaded
+          description: Use pre-generated key and certificate
+          label: I have my own keypair with certificate
+        weight: 30
+      horizon:
+        description: Secure access to Horizon enabling HTTPS instead of HTTP
+        label: HTTPS for Horizon
+        type: checkbox
+        value: true
+        weight: 10
+      hostname:
+        description: Your DNS entries should point to this name. Self-signed certificates
+          also will use this hostname
+        label: DNS hostname for public TLS endpoints
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: text
+        value: public.fuel.local
+        weight: 50
+      metadata:
+        label: Public TLS
+        weight: 110
+      services:
+        description: Enable TLS termination on HAProxy for OpenStack services
+        label: TLS for OpenStack public endpoints
+        type: checkbox
+        value: true
+        weight: 20
     repo_setup:
       metadata:
         always_editable: true
@@ -602,60 +711,60 @@ settings:
           Please make sure your Fuel master node has Internet access to the repository
           before attempting to create a mirror.
 
-          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-6.1/operations.html#external-ubuntu-ops).
+          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
 
           '
         extra_priority: null
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: 2000
-          section: main
+          priority: null
+          section: main universe multiverse
           suite: trusty
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-updates
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-security
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: mos
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1
+          suite: mos7.0
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
         - name: mos-updates
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-updates
+          suite: mos7.0-updates
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-security
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-security
+          suite: mos7.0-security
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-holdback
-          priority: 2100
+          priority: 1100
           section: main restricted
-          suite: mos6.1-holdback
+          suite: mos7.0-holdback
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: Auxiliary
-          priority: 2150
+          priority: 1150
           section: main restricted
           suite: auxiliary
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
     storage:
       ephemeral_ceph:
         description: Configures Nova to store ephemeral volumes in RBD. This works best
@@ -748,7 +857,7 @@ settings:
         description: Remote syslog port
         label: Port
         regex:
-          error: Invalid Syslog port
+          error: Invalid syslog port
           source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
         type: text
         value: '514'
@@ -783,10 +892,10 @@ settings:
         weight: 10
       password:
         type: password
-        value: pBkLbu1k
+        value: sbfn1c8b
       tenant:
         type: text
         value: services
       user:
         type: text
-        value: fuel_stats_user
+        value: fuel_stats_user
\ No newline at end of file
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
index b7404c95c..73c75413b 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
@@ -6,8 +6,8 @@ comment: Config for LF POD1 - HA deployment with Ceph and Opendaylight
 environment:
   name: opnfv
   mode: ha
-  net_segment_type: gre
-wanted_release: Juno on Ubuntu 14.04.1
+  net_segment_type: tun
+wanted_release: Kilo on Ubuntu 14.04
 nodes:
 - id: 1
   interfaces: interfaces_1
@@ -31,16 +31,18 @@ nodes:
   role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
+    cidr: 10.20.0.0/24
+    dhcp_gateway: 10.20.0.2
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
     ipaddress: 10.20.0.2
     netmask: 255.255.0.0
-    dhcp_pool_start: 10.20.0.3
-    dhcp_pool_end: 10.20.0.254
-  DNS_UPSTREAM: 8.8.8.8
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
+  DNS_UPSTREAM: 8.8.8.8
   FUEL_ACCESS:
-    user: admin
     password: admin
+    user: admin
   HOSTNAME: opnfv
   NTP1: 0.pool.ntp.org
   NTP2: 1.pool.ntp.org
@@ -113,9 +115,10 @@ transformations_2:
     name: eth1.302
 network:
   management_vip: 192.168.0.2
-  management_vrouter_vip: 192.168.0.3
+  management_vrouter_vip: 192.168.0.1
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
+    configuration_template: null
     dns_nameservers:
     - 8.8.4.4
     - 8.8.8.8
@@ -128,7 +131,7 @@ network:
     internal_cidr: 192.168.111.0/24
     internal_gateway: 192.168.111.1
     net_l23_provider: ovs
-    segmentation_type: gre
+    segmentation_type: tun
     vlan_range:
     - 1000
     - 1030
@@ -157,28 +160,10 @@ network:
       vlan_start: null
     name: public
     vlan_start: null
-  - cidr: 192.168.2.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.2.2
-      - 192.168.2.254
-    meta:
-      assign_vip: 192.168.2.0/24
-      configurable: true
-      map_priority: 2
-      name: private
-      notation: cidr
-      render_addr_mask: private
-      render_type: cidr
-      seg_type: gre
-      use_gateway: false
-      vlan_start: 103
-    name: private
-    vlan_start: 302
   - cidr: 192.168.0.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.0.2
+    - - 192.168.0.1
       - 192.168.0.254
     meta:
       cidr: 192.168.0.0/24
@@ -198,7 +183,7 @@ network:
   - cidr: 192.168.1.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.1.2
+    - - 192.168.1.1
       - 192.168.1.254
     meta:
       cidr: 192.168.1.0/24
@@ -212,6 +197,24 @@ network:
       vlan_start: 102
     name: storage
     vlan_start: 301
+  - cidr: 192.168.2.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.2.1
+      - 192.168.2.254
+    meta:
+      cidr: 192.168.2.0/24
+      configurable: true
+      map_priority: 2
+      name: private
+      notation: cidr
+      render_addr_mask: null
+      render_type: cidr
+      seg_type: tun
+      use_gateway: false
+      vlan_start: 103
+    name: private
+    vlan_start: 302
   - cidr: 10.20.0.0/16
     gateway: 10.20.0.2
     ip_ranges:
@@ -229,6 +232,35 @@ network:
     vlan_start: null
   public_vip: 172.30.9.64
   public_vrouter_vip: 172.30.9.65
+  vips:
+    management:
+      ipaddr: 192.168.0.2
+      namespace: haproxy
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    public:
+      ipaddr: 172.30.9.64
+      namespace: haproxy
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter:
+      ipaddr: 192.168.0.1
+      namespace: vrouter
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter_pub:
+      ipaddr: 172.30.9.65
+      namespace: vrouter
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
 settings:
   editable:
     access:
@@ -300,8 +332,6 @@ settings:
       murano:
         description: If selected, Murano component will be installed
         label: Install Murano
-        restrictions:
-        - cluster:net_provider != 'neutron'
         type: checkbox
         value: false
         weight: 20
@@ -384,6 +414,8 @@ settings:
         value: true
         weight: 50
       use_vcenter:
+        restrictions:
+        - condition: cluster:net_provider == 'nova_network'
         type: hidden
         value: false
         weight: 30
@@ -420,7 +452,7 @@ settings:
           error: Invalid IP address list
           source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
         type: text
-        value: 8.8.4.4, 8.8.8.8
+        value: 8.8.8.8, 8.8.4.4
         weight: 10
       metadata:
         label: Host OS DNS Servers
@@ -440,6 +472,8 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.mongo.value == false
+          message: Ceilometer and MongoDB are not enabled on the Additional Components
+            section
         weight: 20
       mongo_db_name:
         description: Mongo database name
@@ -485,15 +519,14 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value:  0.pool.ntp.org, 1.pool.ntp.org
+        value: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org
         weight: 10
     kernel_params:
       kernel:
         description: Default kernel parameters
         label: Initial parameters
         type: text
-        value: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
-          nomodeset
+        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
         weight: 45
       metadata:
         label: Kernel parameters
@@ -504,6 +537,7 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.murano.value == false
+          message: Murano is not enabled on the Additional Components section
         weight: 20
       murano_repo_url:
         description: ''
@@ -511,6 +545,32 @@ settings:
         type: text
         value: http://storage.apps.openstack.org/
         weight: 10
+    neutron_advanced_configuration:
+      metadata:
+        label: Neutron Advanced Configuration
+        restrictions:
+        - action: hide
+          condition: cluster:net_provider != 'neutron'
+        weight: 45
+      neutron_dvr:
+        description: Enable Distributed Virtual Routers in Neutron
+        label: Neutron DVR
+        restrictions:
+        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
+            == false
+          : DVR requires L2 population to be enabled.
+        type: checkbox
+        value: false
+        weight: 20
+      neutron_l2_pop:
+        description: Enable L2 population mechanism in Neutron
+        label: Neutron L2 population
+        restrictions:
+        - action: hide
+          condition: networking_parameters:segmentation_type == 'vlan'
+        type: checkbox
+        value: false
+        weight: 10
     neutron_mellanox:
       metadata:
         enabled: true
@@ -557,19 +617,13 @@ settings:
     provision:
       metadata:
         label: Provision
+        restrictions:
+        - action: hide
+          condition: 'true'
         weight: 80
       method:
-        description: Which provision method to use for this cluster.
-        label: Provision method
-        type: radio
+        type: hidden
         value: image
-        values:
-        - data: image
-          description: Copying pre-built images on a disk.
-          label: Image
-        - data: cobbler
-          description: Install from scratch using anaconda or debian-installer.
-          label: (DEPRECATED) Classic (use anaconda or debian-installer)
     public_network_assignment:
       assign_to_all_nodes:
         description: When disabled, public network will be assigned to controllers only
@@ -583,6 +637,61 @@ settings:
         - action: hide
           condition: cluster:net_provider != 'neutron'
         weight: 50
+    public_ssl:
+      cert_data:
+        description: Certificate and private key data, concatenated into a single file
+        label: Certificate
+        restrictions:
+        - action: hide
+          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or (settings:public_ssl.horizon.value
+            == false and settings:public_ssl.services.value == false)
+        type: file
+        value: ''
+        weight: 40
+      cert_source:
+        description: From where we'll get certificate and private key
+        label: Select source for certificate
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: radio
+        value: self_signed
+        values:
+        - data: self_signed
+          description: Generate private key and certificate that will be signed by this
+            key
+          label: Self-signed
+        - data: user_uploaded
+          description: Use pre-generated key and certificate
+          label: I have my own keypair with certificate
+        weight: 30
+      horizon:
+        description: Secure access to Horizon enabling HTTPS instead of HTTP
+        label: HTTPS for Horizon
+        type: checkbox
+        value: true
+        weight: 10
+      hostname:
+        description: Your DNS entries should point to this name. Self-signed certificates
+          also will use this hostname
+        label: DNS hostname for public TLS endpoints
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: text
+        value: public.fuel.local
+        weight: 50
+      metadata:
+        label: Public TLS
+        weight: 110
+      services:
+        description: Enable TLS termination on HAProxy for OpenStack services
+        label: TLS for OpenStack public endpoints
+        type: checkbox
+        value: true
+        weight: 20
     repo_setup:
       metadata:
         always_editable: true
@@ -599,60 +708,60 @@ settings:
           Please make sure your Fuel master node has Internet access to the repository
           before attempting to create a mirror.
 
-          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-6.1/operations.html#external-ubuntu-ops).
+          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
 
           '
         extra_priority: null
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: 2000
-          section: main
+          priority: null
+          section: main universe multiverse
           suite: trusty
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-updates
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-security
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: mos
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1
+          suite: mos7.0
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
         - name: mos-updates
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-updates
+          suite: mos7.0-updates
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-security
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-security
+          suite: mos7.0-security
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-holdback
-          priority: 2100
+          priority: 1100
           section: main restricted
-          suite: mos6.1-holdback
+          suite: mos7.0-holdback
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: Auxiliary
-          priority: 2150
+          priority: 1150
           section: main restricted
           suite: auxiliary
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
     storage:
       ephemeral_ceph:
         description: Configures Nova to store ephemeral volumes in RBD. This works best
@@ -745,7 +854,7 @@ settings:
         description: Remote syslog port
         label: Port
         regex:
-          error: Invalid Syslog port
+          error: Invalid syslog port
           source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
         type: text
         value: '514'
@@ -780,10 +889,10 @@ settings:
         weight: 10
       password:
         type: password
-        value: pBkLbu1k
+        value: sbfn1c8b
       tenant:
         type: text
         value: services
       user:
         type: text
-        value: fuel_stats_user
+        value: fuel_stats_user
\ No newline at end of file
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
index 9701e565a..c874f8c12 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
@@ -2,12 +2,12 @@ title: Deployment Environment Adapter (DEA)
 # DEA API version supported
 version:
 created:
-comment: Config for LF POD2 - HA deployment with Ceph and Opendaylight
+comment: Config for LF POD2 - HA deployment with Ceph
 environment:
   name: opnfv
   mode: ha
-  net_segment_type: gre
-wanted_release: Juno on Ubuntu 14.04.1
+  net_segment_type: tun
+wanted_release: Kilo on Ubuntu 14.04
 nodes:
 - id: 1
   interfaces: interfaces_1
@@ -31,16 +31,18 @@ nodes:
   role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
+    cidr: 10.20.0.0/24
+    dhcp_gateway: 10.20.0.2
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
     ipaddress: 10.20.0.2
     netmask: 255.255.0.0
-    dhcp_pool_start: 10.20.0.3
-    dhcp_pool_end: 10.20.0.254
-  DNS_UPSTREAM: 8.8.8.8
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
+  DNS_UPSTREAM: 8.8.8.8
   FUEL_ACCESS:
-    user: admin
     password: admin
+    user: admin
   HOSTNAME: opnfv
   NTP1: 0.pool.ntp.org
   NTP2: 1.pool.ntp.org
@@ -112,10 +114,11 @@ transformations_2:
     bridge: br-mesh
     name: eth0.302
 network:
-  management_vip: 192.168.1.2
-  management_vrouter_vip: 192.168.1.3
+  management_vip: 192.168.0.2
+  management_vrouter_vip: 192.168.0.1
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
+    configuration_template: null
     dns_nameservers:
     - 8.8.4.4
     - 8.8.8.8
@@ -128,7 +131,7 @@ network:
     internal_cidr: 192.168.111.0/24
     internal_gateway: 192.168.111.1
     net_l23_provider: ovs
-    segmentation_type: gre
+    segmentation_type: tun
     vlan_range:
     - 1000
     - 1030
@@ -157,29 +160,11 @@ network:
       vlan_start: null
     name: public
     vlan_start: null
-  - cidr: 192.168.2.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.2.2
-      - 192.168.2.254
-    meta:
-      cidr: 192.168.2.0/24
-      configurable: true
-      map_priority: 2
-      name: private
-      notation: cidr
-      render_addr_mask: private
-      render_type: cidr
-      seg_type: gre
-      use_gateway: false
-      vlan_start: 103
-    name: private
-    vlan_start: 302
-  - cidr: 192.168.1.0/24
+  - cidr: 192.168.0.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.1.2
-      - 192.168.1.254
+    - - 192.168.0.1
+      - 192.168.0.254
     meta:
       cidr: 192.168.0.0/24
       configurable: true
@@ -195,11 +180,11 @@ network:
       vlan_start: 101
     name: management
     vlan_start: 300
-  - cidr: 192.168.0.0/24
+  - cidr: 192.168.1.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.0.2
-      - 192.168.0.254
+    - - 192.168.1.1
+      - 192.168.1.254
     meta:
       cidr: 192.168.1.0/24
       configurable: true
@@ -212,6 +197,24 @@ network:
       vlan_start: 102
     name: storage
     vlan_start: 301
+  - cidr: 192.168.2.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.2.1
+      - 192.168.2.254
+    meta:
+      cidr: 192.168.2.0/24
+      configurable: true
+      map_priority: 2
+      name: private
+      notation: cidr
+      render_addr_mask: null
+      render_type: cidr
+      seg_type: tun
+      use_gateway: false
+      vlan_start: 103
+    name: private
+    vlan_start: 302
   - cidr: 10.20.0.0/16
     gateway: 10.20.0.2
     ip_ranges:
@@ -229,6 +232,35 @@ network:
     vlan_start: null
   public_vip: 172.30.10.64
   public_vrouter_vip: 172.30.10.65
+  vips:
+    management:
+      ipaddr: 192.168.0.2
+      namespace: haproxy
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    public:
+      ipaddr: 172.30.10.64
+      namespace: haproxy
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter:
+      ipaddr: 192.168.0.1
+      namespace: vrouter
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter_pub:
+      ipaddr: 172.30.10.65
+      namespace: vrouter
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
 settings:
   editable:
     access:
@@ -300,8 +332,6 @@ settings:
       murano:
         description: If selected, Murano component will be installed
         label: Install Murano
-        restrictions:
-        - cluster:net_provider != 'neutron'
         type: checkbox
         value: false
         weight: 20
@@ -384,6 +414,8 @@ settings:
         value: true
         weight: 50
       use_vcenter:
+        restrictions:
+        - condition: cluster:net_provider == 'nova_network'
         type: hidden
         value: false
         weight: 30
@@ -420,7 +452,7 @@ settings:
           error: Invalid IP address list
           source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
         type: text
-        value: 8.8.4.4, 8.8.8.8
+        value: 8.8.8.8, 8.8.4.4
         weight: 10
       metadata:
         label: Host OS DNS Servers
@@ -440,6 +472,8 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.mongo.value == false
+          message: Ceilometer and MongoDB are not enabled on the Additional Components
+            section
         weight: 20
       mongo_db_name:
         description: Mongo database name
@@ -485,15 +519,14 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value: 0.pool.ntp.org, 1.pool.ntp.org
+        value: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org
         weight: 10
     kernel_params:
       kernel:
         description: Default kernel parameters
         label: Initial parameters
         type: text
-        value: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
-          nomodeset
+        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
         weight: 45
       metadata:
         label: Kernel parameters
@@ -504,6 +537,7 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.murano.value == false
+          message: Murano is not enabled on the Additional Components section
         weight: 20
       murano_repo_url:
         description: ''
@@ -511,6 +545,32 @@ settings:
         type: text
         value: http://storage.apps.openstack.org/
         weight: 10
+    neutron_advanced_configuration:
+      metadata:
+        label: Neutron Advanced Configuration
+        restrictions:
+        - action: hide
+          condition: cluster:net_provider != 'neutron'
+        weight: 45
+      neutron_dvr:
+        description: Enable Distributed Virtual Routers in Neutron
+        label: Neutron DVR
+        restrictions:
+        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
+            == false
+          : DVR requires L2 population to be enabled.
+        type: checkbox
+        value: false
+        weight: 20
+      neutron_l2_pop:
+        description: Enable L2 population mechanism in Neutron
+        label: Neutron L2 population
+        restrictions:
+        - action: hide
+          condition: networking_parameters:segmentation_type == 'vlan'
+        type: checkbox
+        value: false
+        weight: 10
     neutron_mellanox:
       metadata:
         enabled: true
@@ -557,19 +617,13 @@ settings:
     provision:
       metadata:
         label: Provision
+        restrictions:
+        - action: hide
+          condition: 'true'
         weight: 80
       method:
-        description: Which provision method to use for this cluster.
-        label: Provision method
-        type: radio
+        type: hidden
         value: image
-        values:
-        - data: image
-          description: Copying pre-built images on a disk.
-          label: Image
-        - data: cobbler
-          description: Install from scratch using anaconda or debian-installer.
-          label: (DEPRECATED) Classic (use anaconda or debian-installer)
     public_network_assignment:
       assign_to_all_nodes:
         description: When disabled, public network will be assigned to controllers only
@@ -583,6 +637,61 @@ settings:
         - action: hide
           condition: cluster:net_provider != 'neutron'
         weight: 50
+    public_ssl:
+      cert_data:
+        description: Certificate and private key data, concatenated into a single file
+        label: Certificate
+        restrictions:
+        - action: hide
+          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or (settings:public_ssl.horizon.value
+            == false and settings:public_ssl.services.value == false)
+        type: file
+        value: ''
+        weight: 40
+      cert_source:
+        description: From where we'll get certificate and private key
+        label: Select source for certificate
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: radio
+        value: self_signed
+        values:
+        - data: self_signed
+          description: Generate private key and certificate that will be signed by this
+            key
+          label: Self-signed
+        - data: user_uploaded
+          description: Use pre-generated key and certificate
+          label: I have my own keypair with certificate
+        weight: 30
+      horizon:
+        description: Secure access to Horizon enabling HTTPS instead of HTTP
+        label: HTTPS for Horizon
+        type: checkbox
+        value: true
+        weight: 10
+      hostname:
+        description: Your DNS entries should point to this name. Self-signed certificates
+          also will use this hostname
+        label: DNS hostname for public TLS endpoints
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: text
+        value: public.fuel.local
+        weight: 50
+      metadata:
+        label: Public TLS
+        weight: 110
+      services:
+        description: Enable TLS termination on HAProxy for OpenStack services
+        label: TLS for OpenStack public endpoints
+        type: checkbox
+        value: true
+        weight: 20
     repo_setup:
       metadata:
         always_editable: true
@@ -599,60 +708,60 @@ settings:
           Please make sure your Fuel master node has Internet access to the repository
           before attempting to create a mirror.
 
-          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-6.1/operations.html#external-ubuntu-ops).
+          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
 
           '
         extra_priority: null
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: 2000
-          section: main
+          priority: null
+          section: main universe multiverse
           suite: trusty
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-updates
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-security
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: mos
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1
+          suite: mos7.0
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
         - name: mos-updates
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-updates
+          suite: mos7.0-updates
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-security
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-security
+          suite: mos7.0-security
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-holdback
-          priority: 2100
+          priority: 1100
           section: main restricted
-          suite: mos6.1-holdback
+          suite: mos7.0-holdback
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: Auxiliary
-          priority: 2150
+          priority: 1150
           section: main restricted
           suite: auxiliary
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
     storage:
       ephemeral_ceph:
         description: Configures Nova to store ephemeral volumes in RBD. This works best
@@ -745,7 +854,7 @@ settings:
         description: Remote syslog port
         label: Port
         regex:
-          error: Invalid Syslog port
+          error: Invalid syslog port
           source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
         type: text
         value: '514'
@@ -780,10 +889,10 @@ settings:
         weight: 10
       password:
         type: password
-        value: pBkLbu1k
+        value: sbfn1c8b
       tenant:
         type: text
         value: services
       user:
         type: text
-        value: fuel_stats_user
+        value: fuel_stats_user
\ No newline at end of file
diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
index 39a3a3192..fe0e34ea9 100644
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
@@ -4,10 +4,10 @@ version:
 created:
 comment: Config for OPNFV BOX - HA deployment with Ceph
 environment:
-  name: opnfv_virt
+  name: opnfv_box
   mode: ha
-  net_segment_type: gre
-wanted_release: Juno on Ubuntu 14.04.1
+  net_segment_type: tun
+wanted_release: Kilo on Ubuntu 14.04
 nodes:
 - id: 1
   interfaces: interfaces_1
@@ -29,23 +29,20 @@ nodes:
   interfaces: interfaces_1
   transformations: transformations_2
   role: ceph-osd,compute
-opnfv:
-  hosts:
-  - name:
-    address:
-    fqdn:
 fuel:
   ADMIN_NETWORK:
+    cidr: 10.20.0.0/24
+    dhcp_gateway: 10.20.0.2
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
     ipaddress: 10.20.0.2
     netmask: 255.255.0.0
-    dhcp_pool_start: 10.20.0.3
-    dhcp_pool_end: 10.20.0.254
-  DNS_UPSTREAM: 8.8.8.8
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
+  DNS_UPSTREAM: 8.8.8.8
   FUEL_ACCESS:
-    user: admin
     password: admin
+    user: admin
   HOSTNAME: opnfv
   NTP1: 0.pool.ntp.org
   NTP2: 1.pool.ntp.org
@@ -117,8 +114,11 @@ transformations_2:
     bridge: br-mesh
     name: eth1.302
 network:
+  management_vip: 192.168.0.2
+  management_vrouter_vip: 192.168.0.1
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
+    configuration_template: null
     dns_nameservers:
     - 8.8.4.4
     - 8.8.8.8
@@ -131,7 +131,7 @@ network:
     internal_cidr: 192.168.111.0/24
     internal_gateway: 192.168.111.1
     net_l23_provider: ovs
-    segmentation_type: gre
+    segmentation_type: tun
     vlan_range:
     - 1000
     - 1030
@@ -142,12 +142,12 @@ network:
     - - 172.30.10.73
       - 172.30.10.82
     meta:
-      cidr: 172.30.10.0/24
+      cidr: 172.16.0.0/24
       configurable: true
       floating_range_var: floating_ranges
       ip_range:
-      - 172.30.10.73
-      - 172.30.10.82
+      - 172.16.0.2
+      - 172.16.0.126
       map_priority: 1
       name: public
       notation: ip_ranges
@@ -177,7 +177,7 @@ network:
       vips:
       - haproxy
       - vrouter
-      vlan_start: 300
+      vlan_start: 101
     name: management
     vlan_start: 300
   - cidr: 192.168.1.0/24
@@ -194,7 +194,7 @@ network:
       render_addr_mask: storage
       render_type: cidr
       use_gateway: false
-      vlan_start: 301
+      vlan_start: 102
     name: storage
     vlan_start: 301
   - cidr: 192.168.2.0/24
@@ -203,23 +203,23 @@ network:
     - - 192.168.2.1
       - 192.168.2.254
     meta:
-      assign_vip: 192.168.2.0/24
+      cidr: 192.168.2.0/24
       configurable: true
       map_priority: 2
       name: private
       notation: cidr
-      render_addr_mask: private
+      render_addr_mask: null
       render_type: cidr
-      seg_type: gre
+      seg_type: tun
       use_gateway: false
-      vlan_start: 302
+      vlan_start: 103
     name: private
     vlan_start: 302
-  - cidr: 10.20.0.0/24
+  - cidr: 10.20.0.0/16
     gateway: 10.20.0.2
     ip_ranges:
     - - 10.20.0.3
-      - 10.20.255.254
+      - 10.20.0.254
     meta:
       configurable: false
       map_priority: 0
@@ -230,6 +230,37 @@ network:
       use_gateway: true
     name: fuelweb_admin
     vlan_start: null
+  public_vip: 172.30.10.3
+  public_vrouter_vip: 172.30.10.2
+  vips:
+    management:
+      ipaddr: 192.168.0.2
+      namespace: haproxy
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    public:
+      ipaddr: 172.30.10.3
+      namespace: haproxy
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter:
+      ipaddr: 192.168.0.1
+      namespace: vrouter
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter_pub:
+      ipaddr: 172.30.10.2
+      namespace: vrouter
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
 settings:
   editable:
     access:
@@ -301,8 +332,6 @@ settings:
       murano:
         description: If selected, Murano component will be installed
         label: Install Murano
-        restrictions:
-        - cluster:net_provider != 'neutron'
         type: checkbox
         value: false
         weight: 20
@@ -385,6 +414,8 @@ settings:
         value: true
         weight: 50
       use_vcenter:
+        restrictions:
+        - condition: cluster:net_provider == 'nova_network'
         type: hidden
         value: false
         weight: 30
@@ -421,7 +452,7 @@ settings:
           error: Invalid IP address list
           source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
         type: text
-        value: 8.8.4.4, 8.8.8.8
+        value: 8.8.8.8, 8.8.4.4
         weight: 10
       metadata:
         label: Host OS DNS Servers
@@ -441,6 +472,8 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.mongo.value == false
+          message: Ceilometer and MongoDB are not enabled on the Additional Components
+            section
         weight: 20
       mongo_db_name:
         description: Mongo database name
@@ -486,15 +519,14 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value:  0.pool.ntp.org, 1.pool.ntp.org
+        value: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org
         weight: 10
     kernel_params:
       kernel:
         description: Default kernel parameters
         label: Initial parameters
         type: text
-        value: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
-          nomodeset
+        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
         weight: 45
       metadata:
         label: Kernel parameters
@@ -505,6 +537,7 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.murano.value == false
+          message: Murano is not enabled on the Additional Components section
         weight: 20
       murano_repo_url:
         description: ''
@@ -512,6 +545,32 @@ settings:
         type: text
         value: http://storage.apps.openstack.org/
         weight: 10
+    neutron_advanced_configuration:
+      metadata:
+        label: Neutron Advanced Configuration
+        restrictions:
+        - action: hide
+          condition: cluster:net_provider != 'neutron'
+        weight: 45
+      neutron_dvr:
+        description: Enable Distributed Virtual Routers in Neutron
+        label: Neutron DVR
+        restrictions:
+        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
+            == false
+          : DVR requires L2 population to be enabled.
+        type: checkbox
+        value: false
+        weight: 20
+      neutron_l2_pop:
+        description: Enable L2 population mechanism in Neutron
+        label: Neutron L2 population
+        restrictions:
+        - action: hide
+          condition: networking_parameters:segmentation_type == 'vlan'
+        type: checkbox
+        value: false
+        weight: 10
     neutron_mellanox:
       metadata:
         enabled: true
@@ -558,19 +617,13 @@ settings:
     provision:
       metadata:
         label: Provision
+        restrictions:
+        - action: hide
+          condition: 'true'
         weight: 80
       method:
-        description: Which provision method to use for this cluster.
-        label: Provision method
-        type: radio
+        type: hidden
         value: image
-        values:
-        - data: image
-          description: Copying pre-built images on a disk.
-          label: Image
-        - data: cobbler
-          description: Install from scratch using anaconda or debian-installer.
-          label: (DEPRECATED) Classic (use anaconda or debian-installer)
     public_network_assignment:
       assign_to_all_nodes:
         description: When disabled, public network will be assigned to controllers only
@@ -584,6 +637,61 @@ settings:
         - action: hide
           condition: cluster:net_provider != 'neutron'
         weight: 50
+    public_ssl:
+      cert_data:
+        description: Certificate and private key data, concatenated into a single file
+        label: Certificate
+        restrictions:
+        - action: hide
+          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or (settings:public_ssl.horizon.value
+            == false and settings:public_ssl.services.value == false)
+        type: file
+        value: ''
+        weight: 40
+      cert_source:
+        description: From where we'll get certificate and private key
+        label: Select source for certificate
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: radio
+        value: self_signed
+        values:
+        - data: self_signed
+          description: Generate private key and certificate that will be signed by this
+            key
+          label: Self-signed
+        - data: user_uploaded
+          description: Use pre-generated key and certificate
+          label: I have my own keypair with certificate
+        weight: 30
+      horizon:
+        description: Secure access to Horizon enabling HTTPS instead of HTTP
+        label: HTTPS for Horizon
+        type: checkbox
+        value: true
+        weight: 10
+      hostname:
+        description: Your DNS entries should point to this name. Self-signed certificates
+          also will use this hostname
+        label: DNS hostname for public TLS endpoints
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: text
+        value: public.fuel.local
+        weight: 50
+      metadata:
+        label: Public TLS
+        weight: 110
+      services:
+        description: Enable TLS termination on HAProxy for OpenStack services
+        label: TLS for OpenStack public endpoints
+        type: checkbox
+        value: true
+        weight: 20
     repo_setup:
       metadata:
         always_editable: true
@@ -600,60 +708,60 @@ settings:
           Please make sure your Fuel master node has Internet access to the repository
           before attempting to create a mirror.
 
-          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-6.1/operations.html#external-ubuntu-ops).
+          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
 
           '
         extra_priority: null
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: 2000
-          section: main
+          priority: null
+          section: main universe multiverse
           suite: trusty
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-updates
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-security
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: mos
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1
+          suite: mos7.0
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
         - name: mos-updates
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-updates
+          suite: mos7.0-updates
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-security
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-security
+          suite: mos7.0-security
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-holdback
-          priority: 2100
+          priority: 1100
           section: main restricted
-          suite: mos6.1-holdback
+          suite: mos7.0-holdback
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: Auxiliary
-          priority: 2150
+          priority: 1150
           section: main restricted
           suite: auxiliary
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
     storage:
       ephemeral_ceph:
         description: Configures Nova to store ephemeral volumes in RBD. This works best
@@ -746,7 +854,7 @@ settings:
         description: Remote syslog port
         label: Port
         regex:
-          error: Invalid Syslog port
+          error: Invalid syslog port
           source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
         type: text
         value: '514'
@@ -781,10 +889,10 @@ settings:
         weight: 10
       password:
         type: password
-        value: pBkLbu1k
+        value: sbfn1c8b
       tenant:
         type: text
         value: services
       user:
         type: text
-        value: fuel_stats_user
+        value: fuel_stats_user
\ No newline at end of file
diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml
index a058bbbde..b127ac919 100644
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml
@@ -46,4 +46,4 @@ nodes:
   password: r00tme
 
 disks:
-  fuel: 50G
+  fuel: 50G
\ No newline at end of file
diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index 84efe55f6..1fa9bb9b0 100644
--- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@ -2,12 +2,12 @@ title: Deployment Environment Adapter (DEA)
 # DEA API version supported
 version:
 created:
-comment: Config for Virtual Environment - HA deployment with Ceph and Opendaylight
+comment: Config for Virtual Environment - HA deployment with Ceph
 environment:
   name: opnfv_virt
   mode: ha
-  net_segment_type: gre
-wanted_release: Juno on Ubuntu 14.04.1
+  net_segment_type: tun
+wanted_release: Kilo on Ubuntu 14.04
 nodes:
 - id: 1
   interfaces: interfaces_1
@@ -15,32 +15,42 @@ nodes:
   role: ceph-osd,controller
 - id: 2
   interfaces: interfaces_1
+  transformations: transformations_1
+  role: ceph-osd,controller
+- id: 3
+  interfaces: interfaces_1
+  transformations: transformations_1
+  role: ceph-osd,controller
+- id: 4
+  interfaces: interfaces_1
   transformations: transformations_2
   role: ceph-osd,compute
-- id: 3
+- id: 5
   interfaces: interfaces_1
   transformations: transformations_2
   role: ceph-osd,compute
-- id: 4
+- id: 6
   interfaces: interfaces_1
   transformations: transformations_2
   role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
+    cidr: 10.20.0.0/24
+    dhcp_gateway: 10.20.0.2
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
     ipaddress: 10.20.0.2
     netmask: 255.255.0.0
-    dhcp_pool_start: 10.20.0.3
-    dhcp_pool_end: 10.20.0.254
-  DNS_UPSTREAM: 10.118.32.193
   DNS_DOMAIN: opnfvericsson.ca
   DNS_SEARCH: opnfvericsson.ca
+  DNS_UPSTREAM: 10.118.32.193
   FUEL_ACCESS:
-    user: admin
     password: admin
+    user: admin
   HOSTNAME: opnfv_virt
   NTP1: 10.118.32.193
   NTP2: 10.118.34.193
-  NTP3:
+  NTP3: null
 interfaces_1:
   eth0:
   - fuelweb_admin
@@ -111,9 +121,10 @@ transformations_2:
     name: eth2.103
 network:
   management_vip: 192.168.0.2
-  management_vrouter_vip: 192.168.0.3
+  management_vrouter_vip: 192.168.0.1
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
+    configuration_template: null
     dns_nameservers:
     - 10.118.32.193
     floating_ranges:
@@ -125,7 +136,7 @@ network:
     internal_cidr: 192.168.111.0/24
     internal_gateway: 192.168.111.1
     net_l23_provider: ovs
-    segmentation_type: gre
+    segmentation_type: tun
     vlan_range:
     - 1000
     - 1030
@@ -157,7 +168,7 @@ network:
   - cidr: 192.168.0.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.0.2
+    - - 192.168.0.1
       - 192.168.0.254
     meta:
       cidr: 192.168.0.0/24
@@ -194,7 +205,7 @@ network:
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.2.2
+    - - 192.168.2.1
       - 192.168.2.254
     meta:
       cidr: 192.168.2.0/24
@@ -202,9 +213,9 @@ network:
       map_priority: 2
       name: private
       notation: cidr
-      render_addr_mask: private
+      render_addr_mask: null
       render_type: cidr
-      seg_type: gre
+      seg_type: tun
       use_gateway: false
       vlan_start: 103
     name: private
@@ -224,8 +235,37 @@ network:
       use_gateway: true
     name: fuelweb_admin
     vlan_start: null
-  public_vip: 172.16.0.2
-  public_vrouter_vip: 172.16.0.3
+  public_vip: 172.16.0.3
+  public_vrouter_vip: 172.16.0.2
+  vips:
+    management:
+      ipaddr: 192.168.0.2
+      namespace: haproxy
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    public:
+      ipaddr: 172.16.0.3
+      namespace: haproxy
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter:
+      ipaddr: 192.168.0.1
+      namespace: vrouter
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+    vrouter_pub:
+      ipaddr: 172.16.0.2
+      namespace: vrouter
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
 settings:
   editable:
     access:
@@ -297,8 +337,6 @@ settings:
       murano:
         description: If selected, Murano component will be installed
         label: Install Murano
-        restrictions:
-        - cluster:net_provider != 'neutron'
         type: checkbox
         value: false
         weight: 20
@@ -381,6 +419,8 @@ settings:
         value: true
         weight: 50
       use_vcenter:
+        restrictions:
+        - condition: cluster:net_provider == 'nova_network'
         type: hidden
         value: false
         weight: 30
@@ -437,6 +477,8 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.mongo.value == false
+          message: Ceilometer and MongoDB are not enabled on the Additional Components
+            section
         weight: 20
       mongo_db_name:
         description: Mongo database name
@@ -482,15 +524,14 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value: 110.118.32.193, 10.118.34.193
+        value: 10.118.32.193, 10.118.34.193
         weight: 10
     kernel_params:
       kernel:
         description: Default kernel parameters
         label: Initial parameters
         type: text
-        value: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
-          nomodeset
+        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
         weight: 45
       metadata:
         label: Kernel parameters
@@ -501,6 +542,7 @@ settings:
         restrictions:
         - action: hide
           condition: settings:additional_components.murano.value == false
+          message: Murano is not enabled on the Additional Components section
         weight: 20
       murano_repo_url:
         description: ''
@@ -508,6 +550,32 @@ settings:
         type: text
         value: http://storage.apps.openstack.org/
         weight: 10
+    neutron_advanced_configuration:
+      metadata:
+        label: Neutron Advanced Configuration
+        restrictions:
+        - action: hide
+          condition: cluster:net_provider != 'neutron'
+        weight: 45
+      neutron_dvr:
+        description: Enable Distributed Virtual Routers in Neutron
+        label: Neutron DVR
+        restrictions:
+        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
+            == false
+          : DVR requires L2 population to be enabled.
+        type: checkbox
+        value: false
+        weight: 20
+      neutron_l2_pop:
+        description: Enable L2 population mechanism in Neutron
+        label: Neutron L2 population
+        restrictions:
+        - action: hide
+          condition: networking_parameters:segmentation_type == 'vlan'
+        type: checkbox
+        value: false
+        weight: 10
     neutron_mellanox:
       metadata:
         enabled: true
@@ -554,19 +622,13 @@ settings:
     provision:
       metadata:
         label: Provision
+        restrictions:
+        - action: hide
+          condition: 'true'
         weight: 80
       method:
-        description: Which provision method to use for this cluster.
-        label: Provision method
-        type: radio
+        type: hidden
         value: image
-        values:
-        - data: image
-          description: Copying pre-built images on a disk.
-          label: Image
-        - data: cobbler
-          description: Install from scratch using anaconda or debian-installer.
-          label: (DEPRECATED) Classic (use anaconda or debian-installer)
     public_network_assignment:
       assign_to_all_nodes:
         description: When disabled, public network will be assigned to controllers only
@@ -580,6 +642,61 @@ settings:
         - action: hide
           condition: cluster:net_provider != 'neutron'
         weight: 50
+    public_ssl:
+      cert_data:
+        description: Certificate and private key data, concatenated into a single file
+        label: Certificate
+        restrictions:
+        - action: hide
+          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or (settings:public_ssl.horizon.value
+            == false and settings:public_ssl.services.value == false)
+        type: file
+        value: ''
+        weight: 40
+      cert_source:
+        description: From where we'll get certificate and private key
+        label: Select source for certificate
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: radio
+        value: self_signed
+        values:
+        - data: self_signed
+          description: Generate private key and certificate that will be signed by this
+            key
+          label: Self-signed
+        - data: user_uploaded
+          description: Use pre-generated key and certificate
+          label: I have my own keypair with certificate
+        weight: 30
+      horizon:
+        description: Secure access to Horizon enabling HTTPS instead of HTTP
+        label: HTTPS for Horizon
+        type: checkbox
+        value: true
+        weight: 10
+      hostname:
+        description: Your DNS entries should point to this name. Self-signed certificates
+          also will use this hostname
+        label: DNS hostname for public TLS endpoints
+        restrictions:
+        - action: hide
+          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
+            == false
+        type: text
+        value: public.fuel.local
+        weight: 50
+      metadata:
+        label: Public TLS
+        weight: 110
+      services:
+        description: Enable TLS termination on HAProxy for OpenStack services
+        label: TLS for OpenStack public endpoints
+        type: checkbox
+        value: true
+        weight: 20
     repo_setup:
       metadata:
         always_editable: true
@@ -596,60 +713,60 @@ settings:
           Please make sure your Fuel master node has Internet access to the repository
           before attempting to create a mirror.
 
-          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-6.1/operations.html#external-ubuntu-ops).
+          For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
 
           '
         extra_priority: null
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: 2000
-          section: main
+          priority: null
+          section: main universe multiverse
           suite: trusty
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-updates
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: ubuntu-security
-          priority: 2000
-          section: main
-          suite: trusty
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
           type: deb
-          uri: http://10.20.0.2:8080/ubuntu-part
+          uri: http://archive.ubuntu.com/ubuntu/
         - name: mos
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1
+          suite: mos7.0
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
         - name: mos-updates
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-updates
+          suite: mos7.0-updates
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-security
-          priority: 2050
+          priority: 1050
           section: main restricted
-          suite: mos6.1-security
+          suite: mos7.0-security
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: mos-holdback
-          priority: 2100
+          priority: 1100
           section: main restricted
-          suite: mos6.1-holdback
+          suite: mos7.0-holdback
           type: deb
-          uri: http://10.20.0.2:8080/mos-ubuntu
+          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/7.0/
         - name: Auxiliary
-          priority: 2150
+          priority: 1150
           section: main restricted
           suite: auxiliary
           type: deb
-          uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+          uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
     storage:
       ephemeral_ceph:
         description: Configures Nova to store ephemeral volumes in RBD. This works best
@@ -742,7 +859,7 @@ settings:
         description: Remote syslog port
         label: Port
         regex:
-          error: Invalid Syslog port
+          error: Invalid syslog port
           source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
         type: text
         value: '514'
@@ -777,10 +894,10 @@ settings:
         weight: 10
       password:
         type: password
-        value: pBkLbu1k
+        value: sbfn1c8b
       tenant:
         type: text
         value: services
       user:
         type: text
-        value: fuel_stats_user
+        value: fuel_stats_user
\ No newline at end of file
diff --git a/fuel/deploy/templates/virtual_environment/conf/dha.yaml b/fuel/deploy/templates/virtual_environment/conf/dha.yaml
index 6d476b874..b671dd311 100644
--- a/fuel/deploy/templates/virtual_environment/conf/dha.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dha.yaml
@@ -15,15 +15,21 @@ nodes:
   libvirtName: controller1
   libvirtTemplate: templates/virtual_environment/vms/controller.xml
 - id: 2
+  libvirtName: controller2
+  libvirtTemplate: templates/virtual_environment/vms/controller.xml
+- id: 3
+  libvirtName: controller3
+  libvirtTemplate: templates/virtual_environment/vms/controller.xml
+- id: 4
   libvirtName: compute1
   libvirtTemplate: templates/virtual_environment/vms/compute.xml
-- id: 3
+- id: 5
   libvirtName: compute2
   libvirtTemplate: templates/virtual_environment/vms/compute.xml
-- id: 4
+- id: 6
   libvirtName: compute3
   libvirtTemplate: templates/virtual_environment/vms/compute.xml
-- id: 5
+- id: 7
   libvirtName: fuel-master
   libvirtTemplate: templates/virtual_environment/vms/fuel.xml
   isFuel: yes
@@ -34,5 +40,5 @@ virtNetConfDir: templates/virtual_environment/networks
 
 disks:
   fuel: 50G
-  controller: 50G
-  compute: 50G
+  controller: 60G
+  compute: 50G
\ No newline at end of file