Merge pull request #33 from simonpasquier/revert-24-add-missing-interface-for-ovs-dvr
Revert "Add missing interface for OVS DVR"
diff --git a/reclass/storage/system/opencontrail_control_cluster.yml b/reclass/storage/system/opencontrail_control_cluster.yml
index a8d916e..d0213b3 100644
--- a/reclass/storage/system/opencontrail_control_cluster.yml
+++ b/reclass/storage/system/opencontrail_control_cluster.yml
@@ -18,9 +18,9 @@
keepalived_vip_priority: 103
opencontrail_database_id: 1
opencontrail_control_node02:
- name: ${_param:opencontrail_control_node02hostname}
+ name: ${_param:opencontrail_control_node02_hostname}
domain: ${_param:cluster_domain}
- classes:
+ classes:
- cluster.${_param:cluster_name}.opencontrail.control
params:
salt_master_host: ${_param:reclass_config_master}
diff --git a/reclass/storage/system/opencontrail_gateway_single.yml b/reclass/storage/system/opencontrail_gateway_single.yml
index 6c0b871..52b2786 100644
--- a/reclass/storage/system/opencontrail_gateway_single.yml
+++ b/reclass/storage/system/opencontrail_gateway_single.yml
@@ -1,7 +1,7 @@
parameters:
+ _param:
+ opencontrail_gateway_hostname: gtw01
reclass:
- _param:
- opencontrail_gateway_hostname: gtw01
storage:
node:
opencontrail_gateway_node01:
diff --git a/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
index a654ea2..9d40ea9 100644
--- a/reclass/storage/system/stacklight_server_cluster.yml
+++ b/reclass/storage/system/stacklight_server_cluster.yml
@@ -1,8 +1,8 @@
parameters:
_param:
stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node01_hostname: mon02
- stacklight_monitor_node01_hostname: mon03
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
reclass:
storage:
node:
@@ -40,4 +40,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node03_address}
- keepalived_vip_priority: 101
\ No newline at end of file
+ keepalived_vip_priority: 101