Skip to content

Commit

Permalink
Tidied repo, moved service registration to API calls
Browse files Browse the repository at this point in the history
Moved service registration via api
Changed app to get all external service configuration from consul
Added factory service to consul
  • Loading branch information
allthingsclowd authored Sep 23, 2018
2 parents 1c38ea1 + 847cfa7 commit d608bd8
Show file tree
Hide file tree
Showing 32 changed files with 300 additions and 1,292 deletions.
Binary file removed .DS_Store
Binary file not shown.
1 change: 0 additions & 1 deletion .admin-token

This file was deleted.

1 change: 0 additions & 1 deletion .appRoleID

This file was deleted.

1 change: 0 additions & 1 deletion .database-token

This file was deleted.

8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ main
.provisioner-token
.approle-id
.secret-id
.orchestrator-token
.orchestrator-token
.admin-token
.appRoleID
.database-token
.wrapped-provisioner-token
.DS_Store
*.json
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ sudo: required
addons:
apt:
packages:
- redis-server
- lynx
- jq
- wget
Expand All @@ -16,12 +15,10 @@ before_script:
- if [ $VAGRANT_CLOUD_TOKEN ] ; then packer validate template.json ; fi
- popd
- bash scripts/install_consul.sh
- bash scripts/install_vault_v2.sh
- bash scripts/install_vault.sh
- bash scripts/install_redis.sh
- bash scripts/install_SecretID_Factory.sh
- sudo cp /home/travis/.vault-token /usr/local/bootstrap/.vault-token
# - sudo cp /home/travis/.database-token /usr/local/bootstrap/.database-token
# - sudo cp /home/travis/.provisioner-token /usr/local/bootstrap/.provisioner-token
# - sudo cp /home/travis/.wrapped-provisioner-token /usr/local/bootstrap/.wrapped-provisioner-token
script:
- source ./var.env
- export REDIS_MASTER_IP=127.0.0.1
Expand Down
1 change: 0 additions & 1 deletion .wrapped-provisioner-token

This file was deleted.

4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder ".", "/usr/local/bootstrap"
config.vm.box = "allthingscloud/go-counter-demo"
config.vm.provision "shell", path: "scripts/install_consul.sh", run: "always"
config.vm.provision "shell", path: "scripts/install_dd_agent.sh", env: {"DD_API_KEY" => ENV['DD_API_KEY']}
config.vm.provision "shell", path: "scripts/install_vault.sh", run: "always"
# config.vm.provision "shell", path: "scripts/install_dd_agent.sh", env: {"DD_API_KEY" => ENV['DD_API_KEY']}

config.vm.provider "virtualbox" do |v|
v.memory = 1024
Expand All @@ -34,7 +35,6 @@ Vagrant.configure("2") do |config|
config.vm.define "leader01" do |leader01|
leader01.vm.hostname = ENV['LEADER_NAME']
leader01.vm.provision "shell", path: "scripts/install_nomad.sh", run: "always"
leader01.vm.provision "shell", path: "scripts/install_vault_v2.sh", run: "always"
leader01.vm.provision "shell", path: "scripts/install_SecretID_Factory.sh", run: "always"
leader01.vm.network "private_network", ip: ENV['LEADER_IP']
leader01.vm.network "forwarded_port", guest: 8500, host: 8500
Expand Down
3 changes: 3 additions & 0 deletions conf/consul.d/consul.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
connect {
enabled = true
}
14 changes: 0 additions & 14 deletions conf/consul.d/goapp.json

This file was deleted.

22 changes: 0 additions & 22 deletions conf/consul.d/redis.json

This file was deleted.

17 changes: 0 additions & 17 deletions conf/consul.d/redisSlave.json

This file was deleted.

22 changes: 0 additions & 22 deletions conf/consul.d/webtier.json

This file was deleted.

90 changes: 0 additions & 90 deletions conf/master.redis.conf

This file was deleted.

Loading

0 comments on commit d608bd8

Please sign in to comment.