Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement an ElasticSearchActivationStore #4724

Merged
merged 20 commits into from
Mar 3, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add elasticsearch to redo and remove whitespace
  • Loading branch information
jiangpengcheng committed Feb 20, 2020
commit 46957d7f2a59e3656c7126f90eddfd26a1b24f05
2 changes: 1 addition & 1 deletion ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ cd <openwhisk_home>
./gradlew distDocker
cd ansible
# couchdb is still needed to store subjects and actions
ansible-playbook -i environments/<environment> couchdb.yml
ansible-playbook -i environments/<environment> couchdb.yml
ansible-playbook -i environments/<environment> initdb.yml
ansible-playbook -i environments/<environment> wipe.yml
# this will deploy a simple ES cluster, you can skip this to use external ES cluster
Expand Down
4 changes: 1 addition & 3 deletions ansible/roles/elasticsearch/tasks/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@
- name: wait until ElasticSearch in this host is up and running
uri:
url: "{{ db.elasticsearch.protocol }}:https://{{ ansible_host }}:{{ http_port }}"
status_code: 200
return_content: yes
register: result
until: result.json is defined
until: result.status == 200
retries: 12
delay: 5
1 change: 1 addition & 0 deletions tools/build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The script is called `redo` because for most development, one will want to "redo
- usage information: `redo -h`
- initialize environment and `docker-machine` (for mac): `redo setup prereq`
- start CouchDB container and initialize DB with system and guest keys: `redo couchdb initdb`
- start ElasticSearch container to store activations: `redo elasticsearch`
- build and deploy system: `redo deploy`
- run tests: `redo props tests`

Expand Down
4 changes: 4 additions & 0 deletions tools/build/redo
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ Components = [
'recreate main db for entities',
yaml = 'wipe.yml'),

makeComponent('elasticsearch',
'deploy elasticsearch',
modes = 'clean'),

makeComponent('build',
'build system',
yaml = False,
Expand Down