commit 2d5a64a1391dcc4becfd8dd49384781d62393f54
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Sep 26 13:31:36 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Sep 26 13:31:36 2018 +0000
tree e93cb44970523b00a0e6461cae96658f1833da2b
parent 3c706d6d828de7aab0d4ec1782b0328751adf337
parent d96015ffe04982fcfb1537fa842af72c1baad444

Merge "Move OC addons from k8s part to OC part"

kubernetes/master/kube-addons.sls

diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index 6206e72..fc3b074 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -46,25 +46,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') %}

kubernetes/master/opencontrail.sls

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 %}