Change genie source from tar to binary
Change-Id: I664494f80ee21cd1c78f5790be27f718e7bc0fec
diff --git a/kubernetes/master/genie.sls b/kubernetes/master/genie.sls
index 5851c22..cb1b7e6 100644
--- a/kubernetes/master/genie.sls
+++ b/kubernetes/master/genie.sls
@@ -18,28 +18,13 @@
default_plugin: {{ master.network.genie.default_plugin }}
{%- endif %}
-/tmp/genie/:
- file.directory:
- - user: root
- - group: root
-
-copy-genie-bin:
- cmd.run:
- - name: docker run --rm -v /tmp/genie/:/tmp/genie/ --entrypoint cp {{ master.network.genie.image }} -v /opt/cni/bin/genie /tmp/genie/
- - require:
- - file: /tmp/genie/
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
-
/opt/cni/bin/genie:
file.managed:
- - source: /tmp/genie/genie
+ - source: {{ master.network.genie.source }}
+ - source_hash: {{ master.network.genie.source_hash }}
- mode: 751
- user: root
- group: root
- - require:
- - cmd: copy-genie-bin
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}
diff --git a/kubernetes/pool/genie.sls b/kubernetes/pool/genie.sls
index c00e080..fc05825 100644
--- a/kubernetes/pool/genie.sls
+++ b/kubernetes/pool/genie.sls
@@ -16,28 +16,13 @@
default_plugin: {{ pool.network.genie.default_plugin }}
{%- endif %}
-/tmp/genie/:
- file.directory:
- - user: root
- - group: root
-
-copy-genie-bin:
- cmd.run:
- - name: docker run --rm -v /tmp/genie/:/tmp/genie/ --entrypoint cp {{ pool.network.genie.image }} -v /opt/cni/bin/genie /tmp/genie/
- - require:
- - file: /tmp/genie/
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
-
/opt/cni/bin/genie:
file.managed:
- - source: /tmp/genie/genie
+ - source: {{ pool.network.genie.source }}
+ - source_hash: {{ pool.network.genie.source_hash }}
- mode: 751
- user: root
- group: root
- - require:
- - cmd: copy-genie-bin
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}