many things

13 files changed, 46 insertions, 102 deletions

diff --git a/jjb/yaml/deploy-dev-env.yaml b/jjb/yaml/deploy-dev-env.yaml
index 9c6d704..36f1425 100644
--- a/jjb/yaml/deploy-dev-env.yaml
+++ b/jjb/yaml/deploy-dev-env.yaml
@@ -17,8 +17,6 @@
             - "customer-web-ui-pipeline"
             - "job-scheduler-server-pipeline"
             - "workflow-server-pipeline"
-            - "openbook-core-pipeline"
-            - "openbook-all-pipeline"
     scm:
       - git:
           url: git@github.com:Talligent/openbook-v4-installer.git
diff --git a/jjb/yaml/openbook-all.yaml b/jjb/yaml/openbook-all-pipeline.yaml
index eb74abf..c5e3283 100644
--- a/jjb/yaml/openbook-all.yaml
+++ b/jjb/yaml/openbook-all-pipeline.yaml
@@ -27,12 +27,17 @@
                               userRemoteConfigs: [
                                   [url: "git@github.com:Talligent/openbook-core.git"]
                               ],
-                              poll: true,
+                              poll: false,
                               changelog: false
                           ]
                       ])
                   }
               }
+              stage("database") {
+                  steps {
+                      build(job: "openbook-database")
+                  }
+              }
               stage("admin-api-server") {
                   steps {
                       build(job: "admin-api-server-pipeline")
diff --git a/jjb/yaml/openbook-core.yaml b/jjb/yaml/openbook-core-pipeline.yaml
index 7a06acf..7a06acf 100644
--- a/jjb/yaml/openbook-core.yaml
+++ b/jjb/yaml/openbook-core-pipeline.yaml
diff --git a/jjb/yaml/openbook-database-pipeline.yaml b/jjb/yaml/openbook-database-pipeline.yaml
deleted file mode 100644
index 06d98c5..0000000
--- a/jjb/yaml/openbook-database-pipeline.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- job:
-    name: openbook-database-pipeline
-    project-type: pipeline
-    dsl: |
-      pipeline {
-          agent {
-              node {
-                label "master"
-              }
-          }
-          triggers {
-              pollSCM 'H/5 * * * *'
-          }
-          stages {
-              stage("docker-container") {
-                  agent {
-                      node {
-                          label "openbook_v4"
-                          customWorkspace "workspace/openbook-database"
-                      }
-                  }
-                  steps {
-                      checkout([
-                          scm: [
-                              $class: "GitSCM",
-                              branches: [
-                                  [name: "master"]
-                              ],
-                              userRemoteConfigs: [
-                                  [url: "git@github.com:Talligent/openbook-v4-ci.git"]
-                              ],
-                              poll: false,
-                              changelog: false
-                          ]
-                      ])
-                      sh(script: "./build-docker-containers.sh database")
-                  }
-              }
-              stage("fetch-ansible") {
-                  agent {
-                      node {
-                          label "openbook_v4"
-                          customWorkspace "workspace/openbook-v4-installer"
-                      }
-                  }
-                  steps {
-                      checkout([
-                          scm: [
-                              $class: "GitSCM",
-                              branches: [
-                                  [name: "master"]
-                              ],
-                              userRemoteConfigs: [
-                                  [url: "git@github.com:Talligent/openbook-v4-installer.git"]
-                              ],
-                              poll: false,
-                              changelog: false
-                          ]
-                      ])
-                  }
-              }
-              stage("sql-script") {
-                  agent {
-                      node {
-                          label "openbook_v4"
-                          customWorkspace "workspace/openbook-database"
-                      }
-                  }
-                  steps {
-                      checkout([
-                          scm: [
-                              $class: "GitSCM",
-                              branches: [
-                                  [name: "master"]
-                              ],
-                              userRemoteConfigs: [
-                                  [url: "git@github.com:Talligent/openbook-database.git"]
-                              ],
-                              poll: true,
-                              changelog: false
-                          ]
-                      ])
-                      sh(script: "./run-ansible-playbook.sh")
-                  }
-              }
-          }
-      }
diff --git a/jjb/yaml/openbook-database.yaml b/jjb/yaml/openbook-database.yaml
new file mode 100644
index 0000000..7482ed1
--- /dev/null
+++ b/jjb/yaml/openbook-database.yaml
@@ -0,0 +1,21 @@
+---
+- job:
+    name: openbook-database
+    project-type: freestyle
+    node: openbook_v4
+    properties:
+      - build-discarder:
+          days-to-keep: 0
+          num-to-keep: 1
+          artifact-days-to-keep: 0
+    triggers:
+      - pollscm:
+          cron: 'H/5 * * * *'
+    scm:
+      - git:
+          url: git@github.com:Talligent/openbook-v4-ci.git
+          branches:
+            - master
+    builders:
+      - shell: |
+          ./build-docker-containers.sh database
diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh
index 09f3c76..a09c30d 100644
--- a/salt/openbook/admin_api_server/files/run.sh
+++ b/salt/openbook/admin_api_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}
+docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}
 exit 0
diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh
index 1782f0f..a563ada 100644
--- a/salt/openbook/admin_web_ui/files/run.sh
+++ b/salt/openbook/admin_web_ui/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}
+docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}
 exit 0
diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml
index 69a518c..63005da 100644
--- a/salt/openbook/ansible/files/openbook.yaml
+++ b/salt/openbook/ansible/files/openbook.yaml
@@ -154,6 +154,16 @@
       with_items:
         - { name: openbook, runlevel: default }
 
+- name: "Stop Openbook"
+  hosts: "{% raw %}{{ groups['target']|sort(reverse=True) }}{% endraw %}"
+  serial: 1
+  tasks:
+    - name: "Stop openobok"
+      shell: /etc/init.d/openbook stop
+
+- name: "Install Openbook"
+  hosts: target
+  tasks:
     - name: "Delete existing docker images"
       shell: |
         {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop || true
@@ -177,11 +187,9 @@
         docker pull {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}
 
 - name: "Start Openbook"
-  hosts: target
+  hosts: "{% raw %}{{ groups['target']|sort }}{% endraw %}"
   serial: 1
   tasks:
     - name: "Start openobok"
-      shell: |
-        /etc/init.d/openbook start
-        sleep 10
+      shell: /etc/init.d/openbook start
       when: openbook_start_app == True
diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh
index cbdcd03..7a5cbc4 100644
--- a/salt/openbook/customer_api_server/files/run.sh
+++ b/salt/openbook/customer_api_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}
+docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}
 exit 0
diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh
index c1f1f06..abb01bd 100644
--- a/salt/openbook/customer_web_ui/files/run.sh
+++ b/salt/openbook/customer_web_ui/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}
+docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}
 exit 0
diff --git a/salt/openbook/database/files/run.sh b/salt/openbook/database/files/run.sh
index f9966ca..10d59f6 100644
--- a/salt/openbook/database/files/run.sh
+++ b/salt/openbook/database/files/run.sh
@@ -18,6 +18,6 @@ else
     mysql_args="--wsrep-new-cluster"
 fi
 
-docker run -d --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql --name {{ pillar["database"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} ${mysql_args}
+docker run -d --rm --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql --name {{ pillar["database"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} ${mysql_args}
 
 exit 0
diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh
index a0fa7e6..764c832 100644
--- a/salt/openbook/job_scheduler_server/files/run.sh
+++ b/salt/openbook/job_scheduler_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}
+docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}
 exit 0
diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh
index 8074abb..fd7e4c4 100644
--- a/salt/openbook/workflow_server/files/run.sh
+++ b/salt/openbook/workflow_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
+docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
 exit 0