Merge branch 'development' of https://github.com/opensds/opensds-inst…

…aller into dev-salt

ansible/group_vars/dashboard.yml

@@ -44,7 +44,7 @@ dashboard_docker_image: opensdsio/dashboard:latest
 
 # If user specifies intalling from source code, then he can choose the specific
 # repository branch
-dashboard_repo_branch: master 
+dashboard_repo_branch: master
 
 # These fields are NOT suggested to be modified
 dashboard_remote_url: https://github.com/opensds/opensds-dashboard.git

ansible/group_vars/hotpot.yml

@@ -22,15 +22,17 @@ dummy:
 # GENERAL #
 ###########
 
-controller_endpoint: "{{ host_ip }}:50040"
-dock_endpoint: localhost:50050
+apiserver_endpoint: "{{ host_ip }}:50040"
+controller_endpoint: "{{ host_ip }}:50049"
+dock_endpoint: "{{ host_ip }}:50050"
 
 # These fields are NOT suggested to be modifie
 hotpot_work_dir: /opt/opensds-hotpot-linux-amd64
 
 opensds_config_dir: /etc/opensds
 opensds_driver_config_dir: "{{ opensds_config_dir }}/driver"
 opensds_log_dir: /var/log/opensds
+apiserver_log_file: "{{ opensds_log_dir }}/osdsapiserver.log"
 controller_log_file: "{{ opensds_log_dir }}/osdslet.log"
 dock_log_file: "{{ opensds_log_dir }}/osdsdock.log"
 
@@ -51,7 +53,7 @@ hotpot_remote_url: https://github.com/opensds/opensds.git
 ###########
 
 # If user specifies intalling from release,then he can choose the specific version
-hotpot_release: v0.5.0 # The version should be at least v0.2.1
+hotpot_release: v0.5.1 # The version should be at least v0.2.1
 
 # These fields are NOT suggested to be modified
 hotpot_download_url: https://github.com/opensds/opensds/releases/download/{{ hotpot_release }}/opensds-hotpot-{{ hotpot_release }}-linux-amd64.tar.gz
@@ -65,5 +67,6 @@ hotpot_tarball_dir: /tmp/opensds-hotpot-{{ hotpot_release }}-linux-amd64
 hotpot_image_tag: latest
 
 # These fields are NOT suggested to be modified
+apiserver_docker_image: opensdsio/opensds-apiserver:{{ hotpot_image_tag }}
 controller_docker_image: opensdsio/opensds-controller:{{ hotpot_image_tag }}
 dock_docker_image: opensdsio/opensds-dock:{{ hotpot_image_tag }}

ansible/roles/cleaner/tasks/main.yml

@@ -19,8 +19,8 @@
     state: stopped
   when: dashboard_installation_type == "container"
 
-- name: kill osdslet and osdsdock daemon service
-  shell: killall osdslet osdsdock
+- name: kill osdslet and osdsdock and osdsapiserver daemon service
+  shell: killall osdslet osdsdock osdsapiserver
   when: install_from != "container"
   ignore_errors: true
 
@@ -31,6 +31,13 @@
     state: stopped
   when: install_from == "container"
 
+- name: kill osdsapiserver containerized service
+  docker_container:
+    name: apiserver
+    image: "{{ apiserver_docker_image }}"
+    state: stopped
+  when: install_from == "container"
+
 - name: kill osdsdock containerized service
   docker_container:
     name: osdsdock

ansible/roles/hotpot-installer/tasks/main.yml

@@ -80,9 +80,11 @@
     cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC
     [osdslet]
     api_endpoint = {{ controller_endpoint }}
-    graceful = True
     log_file = {{ controller_log_file }}
-    socket_order = inc
+    
+    [osdsapiserver]
+    api_endpoint = {{ apiserver_endpoint }}
+    log_file = {{ apiserver_log_file }}
     auth_strategy = {{ opensds_auth_strategy }}
     # If https is enabled, the default value of cert file
     # is /opt/opensds-security/opensds/opensds-cert.pem, 
@@ -123,6 +125,22 @@
     chdir: "{{ hotpot_work_dir }}"
   when: deploy_project != "gelato" and install_from != "container"
 
+- name: run osdsapiserver daemon service
+  shell:
+    cmd: |
+      i=0
+      while
+        i="$((i+1))"
+        [ "$i" -lt 4 ]
+      do
+        nohup bin/osdsapiserver > osdsapiserver.out 2> osdsapiserver.err < /dev/null &
+        sleep 5
+        ps aux | grep osdsapiserver | grep -v grep && break
+      done
+  args:
+    chdir: "{{ hotpot_work_dir }}"
+  when: deploy_project != "gelato" and install_from != "container"
+
 - name: run osdslet containerized service
   docker_container:
     name: osdslet
@@ -132,3 +150,13 @@
     volumes:
     - "/etc/opensds/:/etc/opensds"
   when: deploy_project != "gelato" and install_from == "container"
+
+- name: run osdsapiserver containerized service
+  docker_container:
+    name: apiserver
+    image: "{{ apiserver_docker_image }}"
+    state: started
+    network_mode: host
+    volumes:
+    - "/etc/opensds/:/etc/opensds"
+  when: deploy_project != "gelato" and install_from == "container"