Merge "Move OpenStack dashboard to control nodes"
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/config.yml b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
index 69a8d1b..217a0fd 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
@@ -10,6 +10,7 @@
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
parameters:
_param:
@@ -113,23 +114,22 @@
- cluster.<<node_cluster>>.kubernetes.compute
node:
kubernetes_control_node01:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: master
opencontrail_database_id: 1
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
+
kubernetes_control_node02:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: slave
opencontrail_database_id: 2
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
+
kubernetes_control_node03:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: slave
opencontrail_database_id: 3
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/init.yml b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
index 6254ab0..1c3004f 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
@@ -5,6 +5,7 @@
- system.linux.system.repo.ubuntu
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
+- cluster.k8s-ha-contrail-40
- cluster.k8s-ha-contrail-40.kubernetes
- cluster.overrides
@@ -15,8 +16,6 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: k8s-ha-contrail-40.local
- cluster_name: k8s-ha-contrail-40
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index c3addf5..8aa48ea 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -6,6 +6,7 @@
- system.salt.minion.cert.etcd_client
- cluster.k8s-ha-contrail-40.opencontrail.compute
- cluster.k8s-ha-contrail-40.kubernetes
+- cluster.overrides
parameters:
linux:
@@ -38,6 +39,8 @@
kubelet:
address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
+ kube_proxy:
+ enabled: false
network:
opencontrail:
enabled: true
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 161940e..c556728 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -10,6 +10,7 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
parameters:
_param:
keepalived_vip_interface: ens4
@@ -22,19 +23,19 @@
enabled: true
type: eth
mtu: 1500
- address: ${_param:deploy_address}
- netmask: '255.255.255.0'
-
+ proto: dhcp
ens4:
enabled: true
type: eth
mtu: 1500
- address: ${_param:single_address}
netmask: '255.255.255.0'
+ address: ${_param:single_address}
+ pre_up_cmds:
+ - ip addr flush dev ens4
etcd:
server:
bind:
- host: ${_param:deploy_address}
+ host: ${_param:single_address}
source:
engine: docker_hybrid
ssl:
@@ -48,6 +49,8 @@
engine: none
opencontrail:
enabled: false
+ kube_proxy:
+ enabled: false
common:
addons:
dashboard:
@@ -95,9 +98,9 @@
private_ip_range: 10.150.0.0/16
network_manager:
image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager
-# config:
-# api:
-# host: ${_param:opencontrail_control_address}
+ config:
+ api:
+ host: ${_param:keepalived_vip_address}
identity:
auth_user: admin
auth_password: contrail123
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index d019809..f9a25db 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -70,7 +70,7 @@
kubernetes_proxy_node01_address: 172.16.10.121
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:deploy_address}
+ cluster_local_address: ${_param:single_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
index 447ac9c..a78fce2 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -3,10 +3,10 @@
- system.opencontrail.compute.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.virtual_router
-- system.opencontrail.client.resource.k8s_api
- system.opencontrail.compute.cluster4_0
- cluster.k8s-ha-contrail-40.infra
- cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
parameters:
_param:
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index c76cc57..ee4cbbd 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
-- system.linux.system.repo.mcp.openstack
+# - system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.opencontrail.client.resource.edge_router
@@ -13,9 +13,11 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.opencontrail.client.resource.global_vrouter_config
+- system.opencontrail.client.resource.k8s_api
- system.haproxy.proxy.listen.opencontrail.analytics
- cluster.k8s-ha-contrail-40.infra
- cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
parameters:
_param:
@@ -28,17 +30,16 @@
cluster_node03_address: ${_param:opencontrail_control_node03_address}
opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
opencontrail_router01_address: 172.16.10.131
- linux:
- network:
- interface:
- eth1:
- enabled: true
- type: eth
- proto: dhcp
opencontrail:
compute:
enabled: false
+ version: ${_param:opencontrail_version}
+ disable_flow_collection: true
+ interface:
+ dev: ens4
+ address: None
+ mtu: 1500
common:
identity:
host: none
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
index 0e57868..3a29757 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -6,7 +6,7 @@
opencontrail_control_node02_hostname: ctl02
opencontrail_control_node03_hostname: ctl03
- opencontrail_control_address: 172.16.10.252
+ opencontrail_control_address: 172.16.10.253
opencontrail_control_node01_address: 172.16.10.101
opencontrail_control_node02_address: 172.16.10.102
opencontrail_control_node03_address: 172.16.10.103
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
index c7ec64a..7e74232 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
@@ -9,6 +9,7 @@
parameters:
_param:
cluster_public_host: ${_param:openstack_proxy_address}
+ cluster_public_protocol: https
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
index 72c44ce..97e56ec 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
@@ -8,6 +8,7 @@
parameters:
_param:
cluster_public_host: ${_param:openstack_proxy_address}
+ cluster_public_protocol: https
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}