commit 4d36637a8026a9946e8f747b0912392742281889
author Petr Michalec <epcim@apealive.net> Mon Sep 18 13:54:53 2017 +0200
committer Jakub Josef <jakub.josef@gmail.com> Tue Sep 26 16:51:26 2017 +0200
tree 373f004187bd4017dadc9d9d8c509ffe3e53ccb5
parent 005fc644ce015732862855198f88421945768d7b

Remove nodes spec., deprecated in new way

Change-Id: I2677b0a5c5b564648ec3a1e8a0cd9bb9ad289080

classes/cluster/sl-k8s-contrail/infra/config.yml

diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index c287f17..2a83d69 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -9,7 +9,7 @@
 - system.reclass.storage.salt
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.system.kubernetes_control_cluster
-- system.reclass.storage.system.opencontrail_control_cluster
+#- system.reclass.storage.system.opencontrail_control_cluster
 - cluster.sl-k8s-contrail
 parameters:
   _param:
@@ -19,6 +19,7 @@
     reclass_config_master: ${_param:infra_config_deploy_address}
     single_address: ${_param:infra_config_address}
     linux_system_codename: xenial
+    opencontrail_control_system_codename: trusty
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
     salt_master_host: ${_param:infra_config_deploy_address}
   salt:
@@ -152,11 +153,38 @@
             keepalived_vip_priority: 102
             mysql_cluster_role: slave
         opencontrail_control_node01:
+          name: ${_param:opencontrail_control_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.opencontrail.control
           params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: ${_param:opencontrail_control_system_codename}
+            single_address: ${_param:opencontrail_control_node01_address}
+            keepalived_vip_priority: 103
+            opencontrail_database_id: 1
             rabbitmq_cluster_role: master
         opencontrail_control_node02:
+          name: ${_param:opencontrail_control_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.opencontrail.control
           params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: ${_param:opencontrail_control_system_codename}
+            single_address: ${_param:opencontrail_control_node02_address}
+            keepalived_vip_priority: 102
+            opencontrail_database_id: 2
             rabbitmq_cluster_role: slave
         opencontrail_control_node03:
+          name: ${_param:opencontrail_control_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.opencontrail.control
           params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: ${_param:opencontrail_control_system_codename}
+            single_address: ${_param:opencontrail_control_node03_address}
+            keepalived_vip_priority: 101
+            opencontrail_database_id: 3
             rabbitmq_cluster_role: slave

classes/cluster/sl-k8s-contrail/infra/init.yml

diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index 0b58654..6a22605 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -12,6 +12,7 @@
 
     cluster_domain: sl-k8s-contrail.local
     cluster_name: sl-k8s-contrail
+    cluster_public_host: 172.16.10.254
     apt_mk_version: nightly
   linux:
     network: