commit c504a399446887f29837fd93d27747122bcf533b
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Mon May 22 21:41:06 2017 +0200
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu May 25 08:13:14 2017 -0400
tree f299fa5d605ed60000cc070c1d44a234e2c51747
parent 266ec073fa962a5b702896f292869f05387439e4

Fixing contrail deployment

Add vSRX to underlay. It requires vSRX image
Fix salt.yaml to mimic CI deployment

Change-Id: Ica2d22ee6648a3d54f0be215d614a341067da4f8
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Reviewed-on: https://review.gerrithub.io/362241
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
index c3e5a34..1325108 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
@@ -19,6 +19,7 @@
 {% set HOSTNAME_CTL03 = os_env('HOSTNAME_CTL03', 'ctl03.' + DOMAIN_NAME) %}
 {% set HOSTNAME_CMP01 = os_env('HOSTNAME_CMP01', 'cmp01.' + DOMAIN_NAME) %}
 {% set HOSTNAME_CMP02 = os_env('HOSTNAME_CMP02', 'cmp02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_VSRX01 = os_env('HOSTNAME_VSRX01', 'vsrx01' + DOMAIN_NAME) %}
 
 template:
   devops_settings:
@@ -37,6 +38,7 @@
             default_{{ HOSTNAME_CTL03 }}: +109
             default_{{ HOSTNAME_CMP01 }}: +105
             default_{{ HOSTNAME_CMP02 }}: +106
+            default_{{ HOSTNAME_VSRX01 }}: +250
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -52,9 +54,18 @@
             default_{{ HOSTNAME_CTL03 }}: +109
             default_{{ HOSTNAME_CMP01 }}: +105
             default_{{ HOSTNAME_CMP02 }}: +106
+            default_{{ HOSTNAME_VSRX01 }}: +250
           ip_ranges:
             dhcp: [+90, -10]
 
+      public-pool01:
+        net: {{ os_env('PUBLIC_ADDRESS_POOL01', '10.80.0.0/16:24') }}
+        params:
+          ip_reserved:
+            gateway: +1
+            l2_network_device: +1
+            default_{{ HOSTNAME_VSRX01 }}: +250
+
     groups:
       - name: default
         driver:
@@ -82,12 +93,21 @@
             forward:
               mode: nat
 
+          public:
+            address_pool: public-pool01
+            forward:
+              mode: nat
+
         group_volumes:
          - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
            source_image: !os_env IMAGE_PATH1604  # https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img or
                                              # http://apt.tcpcloud.eu/images/ubuntu-16-04-x64-201608231004.qcow2
            format: qcow2
 
+         - name: vsrx_image
+           source_image: !os_env IMAGE_VSRX
+           format: qcow2
+
         nodes:
           - name: {{ HOSTNAME_CFG01 }}
             role: salt_master
@@ -290,3 +310,26 @@
 
               interfaces: *all_interfaces
               network_config: *all_network_config
+
+          - name: {{ HOSTNAME_VSRX01 }}
+            role: vsrx
+            params:
+              vcpu: !os_env SLAVE_NODE_CPU, 2
+              memory: !os_env SLAVE_NODE_MEMORY, 2048
+              boot:
+                - hd
+              volumes:
+                - name: system
+                  capacity: !os_env NODE_VOLUME_SIZE, 150
+                  backing_store: vsrx_image
+                  format: qcow2
+              interfaces:
+                - label: eth0
+                  l2_network_device: public
+                  interface_model: virtio
+                  mac_address: 52:54:00:4e:b4:36
+                - label: eth1
+                  l2_network_device: admin
+                  interface_model: virtio
+                  mac_address: 52:54:00:e1:44:9d
+