commit 664ee3db508c9b63651c86a09c40b3b780ebf5c9
author Svimba <psvimbersky@mirantis.com> Fri Aug 31 10:18:02 2018 +0200
committer Jan Cach <jcach@mirantis.com> Mon Sep 03 15:10:16 2018 +0000
tree 71696acdd80c5f7935453683c5cc7efaec320504
parent 707eb2028e10dbb0d8d9568fd4b4bb8d31b1d87d

remane opencontrail.yaml to .yml

PROD-22538

Change-Id: I2f9338a5785356bc9b2e5e5c64bfb3e89b038808

kubernetes/control/opencontrail.yml

diff --git a/kubernetes/control/opencontrail.yaml b/kubernetes/control/opencontrail.yml
similarity index 74%
rename from kubernetes/control/opencontrail.yaml
rename to kubernetes/control/opencontrail.yml
index ba22753..6b23781 100644
--- a/kubernetes/control/opencontrail.yaml
+++ b/kubernetes/control/opencontrail.yml
@@ -3,6 +3,9 @@
     opencontrail_identity_user: admin
     opencontrail_identity_password: contrail123
     opencontrail_identity_tenant: admin
+    opencontrail_public_ip_range: 172.17.47.128/25
+    opencontrail_public_ip_network: default-domain:default-project:Public
+    opencontrail_private_ip_range: 10.150.0.0/16
   kubernetes:
     pool:
       network:
@@ -13,10 +16,10 @@
       network:
         engine: none
         opencontrail:
-          version: {{ cookiecutter.opencontrail_version }}
-          public_ip_range: {{ cookiecutter.opencontrail_public_ip_range }}
-          public_network: {{ cookiecutter.get('opencontrail_public_ip_network', 'default-domain:default-project:Public') }}
-          private_ip_range: {{ cookiecutter.opencontrail_private_ip_range }}
+          version: ${_param:opencontrail_version}
+          public_ip_range: ${_param:opencontrail_public_ip_range }
+          public_network: ${_param:opencontrail_public_ip_network }
+          private_ip_range: ${_param:opencontrail_private_ip_range }
           config:
             api:
               host: ${_param:opencontrail_control_address}