Merge pull request #34 from simonpasquier/fix-influxdb-for-single
Add InfluxDB classes to stacklight_server_single
diff --git a/linux/network/interface/ovs_lab_dvr.yml b/linux/network/interface/ovs_lab_dvr.yml
deleted file mode 100644
index 482bd02..0000000
--- a/linux/network/interface/ovs_lab_dvr.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-parameters:
- _param:
- primary_interface: eth1
- tenant_interface: eth2
- external_interface: eth3
- interface_mtu: 9000
- linux:
- network:
- bridge: openvswitch
- interface:
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- type: eth
- mtu: ${_param:interface_mtu}
- proto: manual
- tenant_interface:
- enabled: true
- name: ${_param:tenant_interface}
- type: eth
- mtu: ${_param:interface_mtu}
- proto: manual
- external_interface:
- enabled: true
- name: ${_param:external_interface}
- type: eth
- mtu: ${_param:interface_mtu}
- proto: manual
- br-int:
- enabled: true
- mtu: ${_param:interface_mtu}
- type: ovs_bridge
- br-floating:
- enabled: true
- mtu: ${_param:interface_mtu}
- type: ovs_bridge
- float-to-ex:
- enabled: true
- type: ovs_port
- mtu: 65000
- bridge: br-floating
- br-mgmt:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:primary_interface}
- br-mesh:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
- br-ex:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- address: ${_param:external_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:external_interface}
- use_ovs_ports:
- - float-to-ex
\ No newline at end of file
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