7 files changed, 0 insertions, 131 deletions
diff --git a/salt/openbook/api_server/files/Dockerfile b/salt/openbook/api_server/files/Dockerfile
deleted file mode 100644
index 57c48ea..0000000
--- a/salt/openbook/api_server/files/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM {{ pillar["baseimage"]["image_name"] }}
-MAINTAINER Carlos Konstanski <carlos@talligent.com>
-ADD docker-start.tar.xz /
-EXPOSE 8081 5701 5702
-VOLUME {{ pillar["api_server"]["dirs"]["etc_openbook_api_server"]["name"] }}
-VOLUME {{ pillar["api_server"]["dirs"]["var_log_openbook_api_server"]["name"] }}
-RUN /installdeps.sh
-ENTRYPOINT [ "/start_app.sh" ]
diff --git a/salt/openbook/api_server/files/api_server.json b/salt/openbook/api_server/files/api_server.json
deleted file mode 100644
index 8e75119..0000000
--- a/salt/openbook/api_server/files/api_server.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{% raw %}
-{% set ips = openbook_gcomm_addresses.split(",") %}
-{% if ips|length > 1 %}
-{% set failover = "failover:" %}
-{% else %}
-{% set failover = "" %}
-{% endif %}
-{% endraw %}
-
-{
-    "log.path": "{{ pillar["api_server"]["log"] }}",
-    "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook",
-    "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow",
-    "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs"
-}
diff --git a/salt/openbook/api_server/files/build.sh b/salt/openbook/api_server/files/build.sh
deleted file mode 100644
index 95f7077..0000000
--- a/salt/openbook/api_server/files/build.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Do not call directly. Meant to be called from CI build script.
-
-pushd {{ pillar["api_server"]["build_dir"] }} 2>/dev/null
-
-echo "Creating tmp directory"
-rm -rf tmp
-mkdir tmp
-rm -f docker-start.tar.xz
-
-echo "Populating with custom files"
-rsync -aq data/ tmp/
-
-echo "Repackaging into .xz file"
-tar Jcvf docker-start.tar.xz -C tmp/ .
-
-echo "Deleting existing docker container"
-docker stop {{ pillar["api_server"]["container_name"] }}
-docker container prune -f
-docker rmi -f {{ pillar["api_server"]["image_name"] }}
-
-echo "Building docker Ubuntu image"
-docker build -t {{ pillar["api_server"]["image_name"] }} .
-
-echo "Push docker image to the registry"
-docker tag {{ pillar["api_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["api_server"]["image_name"] }}
-docker push {{ pillar["registry"]["url"] }}/{{ pillar["api_server"]["image_name"] }}
-
-echo "Cleaning up"
-rm -rf tmp
-rm -f docker-start.tar.xz
-
-popd 2>/dev/null
-exit 0
diff --git a/salt/openbook/api_server/files/installdeps.sh b/salt/openbook/api_server/files/installdeps.sh
deleted file mode 100644
index 94a6353..0000000
--- a/salt/openbook/api_server/files/installdeps.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" openjdk-8-jre-headless
-
-curl -k \
-     -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \
-     -o "{{ pillar["api_server"]["jar_name"] }}" \
-     "{{ pillar["jars"]["url"] }}{{ pillar["api_server"]["jar_name"] }}"
-
-exit 0
diff --git a/salt/openbook/api_server/files/run.sh b/salt/openbook/api_server/files/run.sh
deleted file mode 100644
index 86f5ede..0000000
--- a/salt/openbook/api_server/files/run.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker run -d --net=host -v {{ pillar["api_server"]["dirs"]["etc_openbook_api_server"]["name"] }}:{{ pillar["api_server"]["dirs"]["etc_openbook_api_server"]["name"] }} -v {{ pillar["api_server"]["dirs"]["var_log_openbook_api_server"]["name"] }}:{{ pillar["api_server"]["dirs"]["var_log_openbook_api_server"]["name"] }} --name {{ pillar["api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["api_server"]["image_name"] }}
-exit 0
diff --git a/salt/openbook/api_server/files/start_app.sh b/salt/openbook/api_server/files/start_app.sh
deleted file mode 100644
index 87cea8b..0000000
--- a/salt/openbook/api_server/files/start_app.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec java -jar {{ pillar["api_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster
diff --git a/salt/openbook/api_server/init.sls b/salt/openbook/api_server/init.sls
deleted file mode 100644
index f0fdb7c..0000000
--- a/salt/openbook/api_server/init.sls
+++ /dev/null
@@ -1,55 +0,0 @@
-{% for dir in pillar["api_server"]["dirs"].items() %}
-apiserver_dirs_{{ dir[0] }}:
-  file.directory:
-{% if dir[1]["relative_to_buildroot"] %}
-    - name: {{ pillar["api_server"]["build_dir"] }}/{{ dir[1]["name"] }}
-{% else %}
-    - name: {{ dir[1]["name"] }}
-{% endif %}
-    - user: root
-    - group: root
-    - mode: {{ dir[1]["mode"] }}
-    - makedirs: True
-{% endfor %}
-
-{% for file in pillar["api_server"]["files"].items() %}
-apiserver_files_{{ file[0] }}:
-  file.managed:
-{% if file[1]["relative_to_buildroot"] %}
-    - name: {{ pillar["api_server"]["build_dir"] }}/{{ file[1]["path"] }}/{{ file[1]["name"] }}
-{% else %}
-    - name: {{ file[1]["path"] }}/{{ file[1]["name"] }}
-{% endif %}
-    - source: salt://openbook/api_server/files/{{ file[1]["source"] }}
-{% if file[1]["is_template"] %}
-    - template: jinja
-{% endif %}
-    - user: root
-    - group: root
-    - mode: {{ file[1]["mode"] }}
-{% if file[1]["ansible"] %}
-ansible_apiserver_dirs_{{ file[0] }}:
-  file.directory:
-{% if file[1]["is_template"] %}
-    - name: {{ pillar["ansible"]["build_dir"] }}/templates/api_server/{{ file[1]["path"] }}
-{% else %}
-    - name: {{ pillar["ansible"]["build_dir"] }}/files/api_server/{{ file[1]["path"] }}
-{% endif %}
-    - user: root
-    - group: root
-    - mode: "0755"
-    - makedirs: True
-ansible_apiserver_files_{{ file[0] }}:
-  file.managed:
-{% if file[1]["is_template"] %}
-    - name: {{ pillar["ansible"]["build_dir"] }}/templates/api_server/{{ file[1]["path"] }}/{{ file[1]["name"] }}
-    - template: jinja
-{% else %}
-    - name: {{ pillar["ansible"]["build_dir"] }}/files/api_server/{{ file[1]["path"] }}/{{ file[1]["name"] }}
-{% endif %}
-    - source: salt://openbook/api_server/files/{{ file[1]["source"] }}
-    - user: root
-    - group: root
-    - mode: {{ file[1]["mode"] }}
-{% endif %}
-{% endfor %}