summaryrefslogtreecommitdiff
path: root/salt/openbook
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-12-07 16:04:42 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-12-07 16:04:42 -0700
commite2d7fb2ddf7a3f2dbb7aa002da44e5c938490831 (patch)
tree8ad6e423558d7057e98adfa5c8358ef3aa0879b6 /salt/openbook
parentf10c27eb9638204435ad08aed6df67b7236cbbd8 (diff)
Add support for jwt_signature_key
Issue: OB-810
Diffstat (limited to 'salt/openbook')
-rw-r--r--salt/openbook/admin_api_server/files/admin_api_server.json1
-rw-r--r--salt/openbook/admin_web_ui/files/admin_web_ui.json1
-rw-r--r--salt/openbook/ansible/files/env.yaml.openbook.example8
-rw-r--r--salt/openbook/customer_api_server/files/customer_api_server.json1
-rw-r--r--salt/openbook/customer_web_ui/files/customer_web_ui.json1
-rw-r--r--salt/openbook/job_scheduler_server/files/job_scheduler_server.json1
-rw-r--r--salt/openbook/workflow_server/files/workflow_server.json1
7 files changed, 14 insertions, 0 deletions
diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json
index c110a67..b19cffd 100644
--- a/salt/openbook/admin_api_server/files/admin_api_server.json
+++ b/salt/openbook/admin_api_server/files/admin_api_server.json
@@ -16,6 +16,7 @@
,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
,"application.port": {{ openbook_admin_api_server_port }}
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"
diff --git a/salt/openbook/admin_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json
index c35a25c..43177d5 100644
--- a/salt/openbook/admin_web_ui/files/admin_web_ui.json
+++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json
@@ -4,6 +4,7 @@
{% if "True" == openbook_install_admin_web_ui|string() %}
,"application.port": {{ openbook_admin_web_ui_port }}
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"
diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example
index d8f971a..c4bca63 100644
--- a/salt/openbook/ansible/files/env.yaml.openbook.example
+++ b/salt/openbook/ansible/files/env.yaml.openbook.example
@@ -24,6 +24,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- host2:
openbook_database_password: ~
openbook_gcomm_addresses: ~
@@ -39,6 +40,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- develop:
- host1:
openbook_database_password: ~
@@ -55,6 +57,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- host2:
openbook_database_password: ~
openbook_gcomm_addresses: ~
@@ -70,6 +73,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- stage:
- host1:
openbook_database_password: ~
@@ -86,6 +90,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- host2:
openbook_database_password: ~
openbook_gcomm_addresses: ~
@@ -101,6 +106,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- master:
- host1:
openbook_database_password: ~
@@ -117,6 +123,7 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
- host2:
openbook_database_password: ~
openbook_gcomm_addresses: ~
@@ -132,3 +139,4 @@ environments:
openbook_admin_api_server_port: ~
openbook_customer_web_ui_port: ~
openbook_customer_api_server_port: ~
+ openbook_jwt_signature_key: ~
diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json
index 767fa97..ca3fe24 100644
--- a/salt/openbook/customer_api_server/files/customer_api_server.json
+++ b/salt/openbook/customer_api_server/files/customer_api_server.json
@@ -16,6 +16,7 @@
,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
,"application.port": {{ openbook_customer_api_server_port }}
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"
diff --git a/salt/openbook/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json
index 5979275..8cf6986 100644
--- a/salt/openbook/customer_web_ui/files/customer_web_ui.json
+++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json
@@ -4,6 +4,7 @@
{% if "True" == openbook_install_customer_web_ui|string() %}
,"application.port": {{ openbook_customer_web_ui_port }}
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"
diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
index 456e850..fa06af4 100644
--- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
+++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
@@ -14,6 +14,7 @@
,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"
diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json
index 541cbf3..b9a9521 100644
--- a/salt/openbook/workflow_server/files/workflow_server.json
+++ b/salt/openbook/workflow_server/files/workflow_server.json
@@ -14,6 +14,7 @@
,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow"
,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
+ ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}"
{% endif %}
{% if openbook_ssl_cert and openbook_ssl_key %}
,"ssl.cert.path": "{{ openbook_ssl_cert }}"