Move OC addons from k8s part to OC part
K8s addons like DNS and Dashboard should be placed on
cmp nodes. Before it cmp nodes should by connected
to Contrail-controller which are defined at K8s addons.
Related-Bug: PROD-23351
Change-Id: Idcd978c70acb6a87bc37384e52e284c371d8fbe5
diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index 6fcedb1..221624a 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -45,25 +45,6 @@
- group: root
- dir_mode: 755
- makedirs: True
-
-{%- elif master.network.get('opencontrail', {}).get('enabled', False) and master.network.opencontrail.get('version', 3.0) > 3.0 %}
-
-/etc/kubernetes/addons/contrail/contrail.yaml:
- file.managed:
- - source: salt://kubernetes/files/kube-addons/contrail/contrail.yaml
- - template: jinja
- - group: root
- - dir_mode: 755
- - makedirs: True
-
-/etc/kubernetes/addons/contrail/kube-manager.yaml:
- file.managed:
- - source: salt://kubernetes/files/kube-addons/contrail/kube-manager.yaml
- - template: jinja
- - group: root
- - dir_mode: 755
- - makedirs: True
-
{% endif %}
{%- if common.addons.get('virtlet', {}).get('enabled') %}
diff --git a/kubernetes/master/opencontrail.sls b/kubernetes/master/opencontrail.sls
index cde1535..039ea53 100644
--- a/kubernetes/master/opencontrail.sls
+++ b/kubernetes/master/opencontrail.sls
@@ -14,5 +14,28 @@
# - template: jinja
# - makedirs: True
+addon-dir-create-in-oc:
+ file.directory:
+ - name: /etc/kubernetes/addons
+ - user: root
+ - group: root
+ - mode: 0755
+
+/etc/kubernetes/addons/contrail/contrail.yaml:
+ file.managed:
+ - source: salt://kubernetes/files/kube-addons/contrail/contrail.yaml
+ - template: jinja
+ - group: root
+ - dir_mode: 755
+ - makedirs: True
+
+/etc/kubernetes/addons/contrail/kube-manager.yaml:
+ file.managed:
+ - source: salt://kubernetes/files/kube-addons/contrail/kube-manager.yaml
+ - template: jinja
+ - group: root
+ - dir_mode: 755
+ - makedirs: True
+
{%- endif %}
{%- endif %}