airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [48/50] airavata git commit: AIRAVATA-2335 Deploy different keystores based on environment
Date Mon, 03 Apr 2017 16:50:21 GMT
AIRAVATA-2335 Deploy different keystores based on environment


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/570bc5d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/570bc5d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/570bc5d1

Branch: refs/heads/master
Commit: 570bc5d1b4c48483f61b0ff6cbc143f8b4c2b77d
Parents: b45bac6
Author: Marcus Christie <machristie@apache.org>
Authored: Fri Mar 31 09:29:47 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Fri Mar 31 09:29:47 2017 -0400

----------------------------------------------------------------------
 dev-tools/ansible/ansible.cfg                   |  2 +
 .../inventories/testing-0.17/files/airavata.jks | 76 ++++++++++++++++++++
 .../testing-0.17/files/airavata_sym.jks         | 30 ++++++++
 .../testing-0.17/group_vars/all/vars.yml        |  7 +-
 .../templates/airavata-server.properties.j2     |  6 +-
 .../ansible/roles/common/defaults/main.yml      |  3 +
 dev-tools/ansible/roles/common/tasks/main.yml   | 12 ++--
 .../templates/airavata-server.properties.j2     |  6 +-
 8 files changed, 126 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/ansible.cfg
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/ansible.cfg b/dev-tools/ansible/ansible.cfg
new file mode 100644
index 0000000..9af1301
--- /dev/null
+++ b/dev-tools/ansible/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+inventory_ignore_extensions = .jks
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks b/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
new file mode 100644
index 0000000..4124c40
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/files/airavata.jks
@@ -0,0 +1,76 @@
+$ANSIBLE_VAULT;1.1;AES256
+32656330396637356236343162313734356339656337633933323238656630646566366533646333
+3139613434336665386532326136353266373839376563630a313865376639663637643130386364
+65313436343330303437613639653833333530383130383266643963336334373366353062393762
+6534303635313039320a643139666331343435303037356139663235613437653235326666396132
+38376233343461656232353963306362383435323061623164623135613538376161656533306464
+64613637303666323439306466666266363764306133346132393931383631393964363864343037
+31353737323039303961643933316164653635326333633930343665616135646338386661316231
+31303462366239326664326139353433343232363061363464356236353938343338306562363864
+30616137343539656237303030343863613432646366383232396262373538663030666332303061
+38383630613535663332323830303130313039393430656666316361383335326164393138393062
+37663535326533333239613364656638313239663365353261633934656132633732333332366337
+35613733666466363662633363633530376133663436653462656538346134353965303561643031
+65376462663964323137356264303831383933303862393435313633333337303635336133613932
+35356439326431353932333839643433326430653638626231663733326464643338323639656334
+31363433656163643136396132633766343937313331363537353930643331346135643663373535
+65343164313065396634636330626130643165336365663166343035363238316630626433653032
+65323561366363366561396562346533653135623565666166373230303862376463316637313734
+39373166626633626266306538373138303131343665316165346530363061656130333739363865
+31326631316130306331353034306663643531646635373638356164613333353536356634346236
+30663034613936303861636561633761663335326534393236646633333261663136643831396637
+62326135646265306662336239326363613736323162633933326636303536633263323437373262
+63393438623834626337626438393332353838316336666136663364353431623530653633626561
+66646238323238643963653162323136636265396333313236626632353237393565363462633734
+33666533303132306563346538393433663161623832613065346136376532343131383830353438
+65306235336534313733393238646235616366383035303566616330633437393132363262316337
+38626135626537353664376133323466373939323638616630633538663533313061373763373535
+33343564623963613336396463333361383534333735353261353639373435393466346131356562
+33366262376533393161613932343938396136663532373231626362356663386263613332323539
+38613666356430653537326663303331613431353434663737323935326566656461653630306436
+66393337323938373030616563373639623665653332643335653861643034346239666337336132
+31663463343530313964303232633662383535313436626361313236653466353538313663636235
+31316261323134646639383865613434643762346562323337333662306162333936373863656135
+35666462653631366136623137613131333962363030646531396366633030666632376439373036
+35393932633333653535363266626665363662663237303766666332326161306666333061646231
+37626637653365343962653336326332353739333664393831653132636431656439633134383139
+64363035353236333835393932616263346334346162376261643931396137656338373437643736
+37643364616264306531616534396332303932636336656434376663393265636135346262346562
+36633833393265356530646633343866646635643932336430363634313237363637653965633438
+32323534383164376563323136666533373338333766343663326566613364636136303461393232
+65306635326663633836386166383564363832356166616439373833346561623436373635393533
+34393930393764393363363330646161346331376636666132656662626434353338343861373964
+66633561396338306339393665633565643366666130643235613732626637643133656465316264
+37306230323665343730363761643637336665313437366366346139643137313165623339663436
+61663863366134666163616438326639636132643331613265353831383134356133376131333538
+30663132306633646264333931656233613039353830363135396364383730663133313730323739
+38336537663830333466663033653361636332303534356630333730303731613539633635636230
+33326233663763653039303131656437326361306537396130353162373333616339363930363637
+38333963306235333837303361386332383762306130393338373034633334313835613565623865
+32333330616337656566346231393636363061326364633136626539313634396337636661313838
+34636464303863636639666231363965316336646461383234656161663035366330643039386266
+62343564353835386637626165663438353739386538326463303832633765323563383036386437
+32633065303532303631356236383862316563346237653562393033623035636431343138646237
+62386463353862643865333836613938653561316335366563323338643834616634383361346162
+61343436356638333965396238623639303631386363373432323032636139633962366262316438
+33313065653130366235613133303130306362623133386239323637626561643536653830663038
+36363463313838366461626639636139616462336335373438613230663536346332656436653235
+61316439343731646631663133393065313462643230643162313462343365656431363438613933
+65343032653038633330653734356439353537363236343163623138333836663862383035373537
+31626136363232666362613036366536323533386534366264636131656362373963643137333830
+34373039653939313863303736643761376332313161343232323863323832313631366138396661
+64323638383532333263316132303538376631396637656463366430343865633061363636373834
+33373163376239356433373230323561343830326434316661346433323233353933313632666533
+63626130393866653866656231386532373461346236653363653338396165663431383438386166
+63636230643439626337386638613662646636326435313937623334333933303431653335663333
+35313935613034353865383633643334333865386262353632353632383933636161343638303033
+66373037353435386263396664333335323932616137653839323133323032386265306562393561
+64643831353835366365623531626661626466366563666431396233396634353731613033376265
+65366231653562393233386231333435366438663932393962326464666161643666303932306132
+35383338333533343133636662316635343531303535383237653866353563623333333838383138
+33333439383661666637306531313865343164653633323962346430653762386230313035336664
+63336634633434346164313664613539613832643939633331643132363232396637376234353539
+32653136363135646431376131373632353363383239303536343865373632366337333261353935
+34323466396430363830303332376434343534623037613862323732336566623366333861373134
+64373535336133616537613362646164366237343433363838663731353961376538346534646337
+373637313538306332616430383839623432

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks b/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
new file mode 100644
index 0000000..13ccf1b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/files/airavata_sym.jks
@@ -0,0 +1,30 @@
+$ANSIBLE_VAULT;1.1;AES256
+66393935613465373265366662383133353632633262353839623837636364373339336564636265
+3862663231313565313064643833646530636361333866610a636266666561306263343632663734
+33306432363830323132653038326139323464393065313631373936346162386161626461396530
+3061376439346264310a346630616535326435626235393564643062326665313239373839336331
+38316134613764373336333338323263356563396638303932656562336538333137643131373366
+35653334383566313262336261623339626532333634363531313534353762356534643961646338
+34633938333436333135643736663437373532633061366464343632643366343337366262386465
+33373333333033303262316566346565613731633361333438363063616165333231323635646333
+34303463656431663932326464356332353235336238653462663463373332656231373562626664
+65346131663064376232643435653264383465323761373063366162663236323935373139386138
+39623734643064623635376261646465383663613238623531613066306464326662346532346365
+63623064383436303634393639316638366136653563663930303130643531373166613133653338
+36636433626539366661656164613032653931356561336336343561323962336462383164393463
+65353265363535616136306136353064346561666439663532626234363763653535663061386232
+61663566343361666634346134623538366664396236346365336431383937653761643235613661
+32373439656332306536623336343763386364363265306138356138616464656662363434636531
+30646163333462636236336532383964643234616131663465666663633333343366376134666263
+63353161336366613065303434656537396237643938376233333431663232356630373038333835
+37306162623439323062626532656633646138386131643037323566643264653432633735333362
+65613564393232393433646334376639356564376661663430353630626534336566663061303632
+64633235333463626435323134636333353536393936663539663539336233363934333931323961
+63313739333733613465376334336239306633636136383831396533326530616133373366653531
+33356137656636323037303430623065393930633731346634346161633334313362613136313138
+36633835353665626462363031653161646530366339363732373865343136356637326631386437
+30383235306538303261613262376634303164313862366330393463346261363866346336666136
+37333566396436383534633330316465306461383537616661343265663731363561323137303164
+36336532333233343463633064346162646562613332646331343931363838333739636335376331
+66626436313938346362303932336339636434666665373862306462646162393066303338383265
+64363138663564386332383032366265666565643633393236663830313936343637

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
index 3229580..d17dfe0 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -64,12 +64,11 @@ default_gateway: "php_reference_gateway"
 # Credential and keystore related variables
 #authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
 authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
+keystore_src_path: "{{inventory_dir}}/files/airavata.jks"
 keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
+client_truststore_src_path: "{{inventory_dir}}/files/airavata.jks"
 client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
+cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
 cred_keystore_passwd: "airavata"
 cred_keystore_alias: "airavata"
 cred_store_server_host: "{{ ansible_fqdn }}"

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index cb69c9f..2cd5013 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -201,7 +201,7 @@ job.notification.flags=abe
 ###########################################################################
 # Credential Store module Configuration
 ###########################################################################
-credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore }}
+credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename
}}
 credential.store.keystore.alias={{ cred_keystore_alias }}
 credential.store.keystore.password={{ cred_keystore_passwd }}
 credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
@@ -291,10 +291,10 @@ TLS.enabled={{ tls_enable }}
 TLS.api.server.port={{ api_server_tls_port }}
 TLS.client.timeout=10000
 #### keystore configuration ####
-keystore.path={{ keystores_location }}/{{ keystore }}
+keystore.path={{ keystores_location }}/{{ keystore_src_path | basename }}
 keystore.password={{ keystore_passwd }}
 #### trust store configuration ####
-trust.store={{ keystores_location }}/{{ client_truststore }}
+trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
 trust.store.password=airavata
 #### remote authorization server url ####
 remote.oauth.authorization.server=https://idp.scigap.org:9443/services/

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/common/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/common/defaults/main.yml b/dev-tools/ansible/roles/common/defaults/main.yml
new file mode 100644
index 0000000..9b0340e
--- /dev/null
+++ b/dev-tools/ansible/roles/common/defaults/main.yml
@@ -0,0 +1,3 @@
+keystore_src_path: "airavata.jks"
+client_truststore_src_path: "airavata.jks"
+cred_keystore_src_path: "airavata_sym.jks"

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/common/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/common/tasks/main.yml b/dev-tools/ansible/roles/common/tasks/main.yml
index eac1a60..e46cba4 100644
--- a/dev-tools/ansible/roles/common/tasks/main.yml
+++ b/dev-tools/ansible/roles/common/tasks/main.yml
@@ -40,16 +40,16 @@
         owner={{ user }} group={{ group }}
 
 - name: Transfer airavata.jks KeyStore file
-  copy: src={{ keystore }}
-        dest="{{ keystores_location }}/{{ keystore }}"
+  copy: src={{ keystore_src_path }}
+        dest="{{ keystores_location }}/{{ keystore_src_path | basename }}"
         owner={{ user }} group={{ group }}
 
 - name: Transfer airavata_sym.jks KeyStore file
-  copy: src={{ cred_keystore }}
-        dest="{{ keystores_location }}/{{ cred_keystore }}"
+  copy: src={{ cred_keystore_src_path }}
+        dest="{{ keystores_location }}/{{ cred_keystore_src_path | basename }}"
         owner={{ user }} group={{ group }}
 
 - name: Transfer client trust store KeyStore file
-  copy: src={{ client_truststore }}
-        dest="{{ keystores_location }}/{{ client_truststore }}"
+  copy: src={{ client_truststore_src_path }}
+        dest="{{ keystores_location }}/{{ client_truststore_src_path | basename }}"
         owner={{ user }} group={{ group }}

http://git-wip-us.apache.org/repos/asf/airavata/blob/570bc5d1/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
index bf92e39..bf6f536 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -189,7 +189,7 @@ job.notification.flags=abe
 ###########################################################################
 # Credential Store module Configuration
 ###########################################################################
-credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore }}
+credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename
}}
 credential.store.keystore.alias={{ cred_keystore_alias }}
 credential.store.keystore.password={{ cred_keystore_passwd }}
 credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
@@ -279,10 +279,10 @@ TLS.enabled={{ tls_enable }}
 TLS.api.server.port={{ api_server_tls_port }}
 TLS.client.timeout=10000
 #### keystore configuration ####
-keystore.path={{ keystores_location }}/{{ keystore }}
+keystore.path={{ keystores_location }}/{{ keystore_src_path | basename }}
 keystore.password={{ keystore_passwd }}
 #### trust store configuration ####
-trust.store={{ keystores_location }}/{{ client_truststore }}
+trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
 trust.store.password=airavata
 #### remote authorization server url ####
 remote.oauth.authorization.server=https://idp.scigap.org:9443/services/


Mime
View raw message