Update docs, site.yml, inventory and service files

wso2 · Apr 6, 2020 · 2bc4a8b · 2bc4a8b
1 parent 16bfc08
commit 2bc4a8b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -129,6 +129,8 @@ The existing Ansible scripts contain the configurations to set-up a single node
 apim_1 ansible_host=172.28.128.4 ansible_user=vagrant
 ```
 
+Update the hostname in dev/host_vars/apim_1.yml with ansible_host, 172.28.128.4
+
 Run the following command to run the scripts.
 
 `ansible-playbook -i dev site.yml`

diff --git a/dev/inventory b/dev/inventory
@@ -1,14 +1,14 @@
 [apim]
 apim_1 ansible_host=[ip_address] ansible_user=[ssh_user]
+
 # Example
+# [apim]
 # apim_1 ansible_host=172.28.128.4 ansible_user=vagrant
 
-[apim-analytics]
-apim-analytics-worker_1 ansible_host=[ip_address] ansible_user=[ssh_user]
 # Example
+# [apim-analytics]
 # apim-analytics-worker_1 ansible_host=172.28.128.4 ansible_user=vagrant
 
-[apim-is-as-km]
-apim-is-as-km_1 ansible_host=[ip_address] ansible_user=[ssh_user]
 # Example
+# [apim-is-as-km]
 # apim_is_as_km_1 ansible_host=172.28.128.4 ansible_user=vagrant
diff --git a/roles/apim-devportal/templates/wso2apim-devportal.service.j2 b/roles/apim-devportal/templates/wso2apim-devportal.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart={{ carbon_home }}/bin/wso2server.sh -Dprofile=api-devportal start
 ExecStop={{ carbon_home }}/bin/wso2server.sh stop
-ExecRestart={{ carbon_home }}/bin/wso2server.sh restart
+ExecReload={{ carbon_home }}/bin/wso2server.sh restart
 PIDFile={{ carbon_home }}/wso2carbon.pid
 User={{ wso2_user }}
 Group={{ wso2_group }}

diff --git a/roles/apim-gateway/templates/wso2apim-gateway.service.j2 b/roles/apim-gateway/templates/wso2apim-gateway.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart={{ carbon_home }}/bin/wso2server.sh -Dprofile=gateway-worker start
 ExecStop={{ carbon_home }}/bin/wso2server.sh stop
-ExecRestart={{ carbon_home }}/bin/wso2server.sh restart
+ExecReload={{ carbon_home }}/bin/wso2server.sh restart
 PIDFile={{ carbon_home }}/wso2carbon.pid
 User={{ wso2_user }}
 Group={{ wso2_group }}

diff --git a/roles/apim-km/templates/wso2apim-km.service.j2 b/roles/apim-km/templates/wso2apim-km.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart={{ carbon_home }}/bin/wso2server.sh -Dprofile=api-key-manager start
 ExecStop={{ carbon_home }}/bin/wso2server.sh stop
-ExecRestart={{ carbon_home }}/bin/wso2server.sh restart
+ExecReload={{ carbon_home }}/bin/wso2server.sh restart
 PIDFile={{ carbon_home }}/wso2carbon.pid
 User={{ wso2_user }}
 Group={{ wso2_group }}

diff --git a/roles/apim-publisher/templates/wso2apim-publisher.service.j2 b/roles/apim-publisher/templates/wso2apim-publisher.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart={{ carbon_home }}/bin/wso2server.sh -Dprofile=api-publisher start
 ExecStop={{ carbon_home }}/bin/wso2server.sh stop
-ExecRestart={{ carbon_home }}/bin/wso2server.sh restart
+ExecReload={{ carbon_home }}/bin/wso2server.sh restart
 PIDFile={{ carbon_home }}/wso2carbon.pid
 User={{ wso2_user }}
 Group={{ wso2_group }}

diff --git a/roles/apim-tm/templates/wso2apim-tm.service.j2 b/roles/apim-tm/templates/wso2apim-tm.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 ExecStart={{ carbon_home }}/bin/wso2server.sh -Dprofile=traffic-manager start
 ExecStop={{ carbon_home }}/bin/wso2server.sh stop
-ExecRestart={{ carbon_home }}/bin/wso2server.sh restart
+ExecReload={{ carbon_home }}/bin/wso2server.sh restart
 PIDFile={{ carbon_home }}/wso2carbon.pid
 User={{ wso2_user }}
 Group={{ wso2_group }}

diff --git a/site.yml b/site.yml
@@ -22,12 +22,6 @@
   roles:
     - common
 
-- name: Apply API Manager Analytics worker configuration to an apim-analytics-worker node
-  hosts:
-    - apim-analytics-worker_1
-  roles:
-    - apim-analytics-worker
-
 - name: Apply API Manager default configuration to an apim node
   hosts:
     - apim_1