commit 32be9b01c5705c35276bc10959c3ecf5814cc8c6
author Marek Celoud <mceloud@mirantis.com> Mon Dec 04 09:56:02 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Mon Dec 04 09:56:02 2017 +0000
tree f0dc4439cadadf344daf1508cd2c4d3a4f1cd16d
parent 7e2b497e5495707658797e36d9a224a9649b4291
parent f52f645479c6dba258b50bd169b3b2a30a126b21

Merge "Glance client images URL fixes"

classes/cluster/os-ha-contrail-40/infra/config.yml

diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index 6428fa7..b93074a 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -40,6 +40,8 @@
 - cluster.os-ha-contrail-40
 parameters:
   _param:
+    ubuntu_xenial_image_url: "http://ci.mcp.mirantis.net:8085/images/ubuntu-16-04-x64-mcp1.1.qcow2"
+    cirros_image_url: "http://ci.mcp.mirantis.net:8085/images/cirros-x64-20170828.qcow2"
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master
     reclass_config_master: ${_param:infra_config_deploy_address}

classes/cluster/os-ha-contrail/infra/config.yml

diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index d95205e..ee376e8 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -43,6 +43,8 @@
 - cluster.os-ha-contrail
 parameters:
   _param:
+    ubuntu_xenial_image_url: "http://ci.mcp.mirantis.net:8085/images/ubuntu-16-04-x64-mcp1.1.qcow2"
+    cirros_image_url: "http://ci.mcp.mirantis.net:8085/images/cirros-x64-20170828.qcow2"
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master
     reclass_config_master: ${_param:infra_config_deploy_address}
@@ -70,7 +72,6 @@
           - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
           post_down_cmds:
           - "iptables -t nat -F POSTROUTING"
-
   nginx:
     server:
       site:
@@ -134,7 +135,7 @@
           expression: <<node_hostname>>__equals__ntw03
           cluster_param:
             opencontrail_control_node03_address:
-              value_template: <<node_control_ip>>  
+              value_template: <<node_control_ip>>
         openstack_compute:
           expression: <<node_hostname>>__startswith__cmp
           node_class: