Gateway node model removed from new lab models
Change-Id: Iea7f6e6623a0e44e2c35c7b3304cb7b78c3bb985
diff --git a/classes/cluster/os_ha_ovs/openstack/gateway.yml b/classes/cluster/os_ha_ovs/openstack/gateway.yml
deleted file mode 100644
index dcb29f5..0000000
--- a/classes/cluster/os_ha_ovs/openstack/gateway.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
-- cluster.os_ha_ovs
-parameters:
- _param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
- interface_mtu: 9000
- linux_system_codename: xenial
- linux:
- network:
- bridge: openvswitch
- interface:
- dhcp_int:
- enabled: true
- name: ens3
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- tenant_interface:
- enabled: true
- name: ${_param:tenant_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- external_interface:
- enabled: true
- name: ${_param:external_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- br-floating:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- br-mgmt:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- mtu: ${_param:interface_mtu}
- use_interfaces:
- - ${_param:primary_interface}
- br-mesh:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
- float-to-ex:
- enabled: true
- type: ovs_port
- mtu: ${_param:interface_mtu}
- bridge: br-floating
- 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/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index 8cad637..bf516ea 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -17,7 +17,6 @@
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklight_server_cluster
- cluster.sl_os_ovs.openstack.proxy
@@ -83,10 +82,6 @@
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
- openstack_gateway_node01:
- params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
openstack_proxy_node01:
classes:
- cluster.sl_os_ovs.openstack.proxy
diff --git a/classes/cluster/sl_os_ovs/openstack/gateway.yml b/classes/cluster/sl_os_ovs/openstack/gateway.yml
deleted file mode 100644
index e19356c..0000000
--- a/classes/cluster/sl_os_ovs/openstack/gateway.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
-- cluster.sl_os_ovs
-parameters:
- _param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
- interface_mtu: 9000
- linux_system_codename: xenial
- linux:
- network:
- bridge: openvswitch
- interface:
- dhcp_int:
- enabled: true
- name: ens3
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- tenant_interface:
- enabled: true
- name: ${_param:tenant_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- external_interface:
- enabled: true
- name: ${_param:external_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- br-floating:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- br-mgmt:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- mtu: ${_param:interface_mtu}
- use_interfaces:
- - ${_param:primary_interface}
- br-mesh:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
- float-to-ex:
- enabled: true
- type: ovs_port
- mtu: ${_param:interface_mtu}
- bridge: br-floating
- 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/classes/cluster/sl_os_ovs/openstack/init.yml b/classes/cluster/sl_os_ovs/openstack/init.yml
index 7cf7570..82f7f5a 100644
--- a/classes/cluster/sl_os_ovs/openstack/init.yml
+++ b/classes/cluster/sl_os_ovs/openstack/init.yml
@@ -129,11 +129,6 @@
names:
- ctl03
- ctl03.${_param:cluster_domain}
- gtw01:
- address: ${_param:openstack_gateway_address}
- names:
- - gtw01
- - gtw01.${_param:cluster_domain}
cmp01:
address: 172.16.10.105
names:
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 5dc9b59..9621aa3 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/init.yml
@@ -6,7 +6,6 @@
stacklight_monitor_node03_address: 172.16.10.109
stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
- openstack_gateway_address: 172.16.10.110
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}