Added redis container to FE config
Change-Id: I8ae1640273fda724035574ea4c91b2458fa424a1
diff --git a/frontend/Vagrantfile b/frontend/Vagrantfile
index c2462c8..b67c7fa 100644
--- a/frontend/Vagrantfile
+++ b/frontend/Vagrantfile
@@ -2,18 +2,33 @@
# base image
config.vm.box = "ubuntu/trusty64"
- # setup a private network to the host machine
- config.vm.network "private_network", ip: "192.168.46.100"
-
# share the folder
config.vm.synced_folder "../", "/home/vagrant/service-profile"
config.vm.synced_folder "../../xos", "/home/vagrant/xos", create: true
- config.vm.synced_folder "../../xos-services", "/home/vagrant/xos-services", create: true
+ config.vm.synced_folder "../../xos_services", "/home/vagrant/xos_services", create: true
+ config.vm.synced_folder "../../xos_libraries", "/home/vagrant/xos_libraries", create: true
config.vm.synced_folder ".", "/vagrant", disabled: true
- # increase RAM
- config.vm.provider :virtualbox do |vb|
- vb.customize ['modifyvm', :id,'--memory', '4096']
+ # set the frontend vm
+ config.vm.define "frontend" do |d|
+ d.vm.network "forwarded_port", guest: 9999, host: 9999
+ d.vm.network "forwarded_port", guest: 6379, host: 6379
+ d.vm.network "private_network", ip: "192.168.46.100"
+ d.vm.provider "virtualbox" do |vb|
+ vb.memory = "2048"
+ end
end
+ config.vm.provision "shell", privileged: false, inline: <<-SHELL
+ sudo apt-get update
+ sudo apt-get install -y apt-transport-https ca-certificates git
+ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+ echo deb https://apt.dockerproject.org/repo ubuntu-trusty main | sudo tee /etc/apt/sources.list.d/docker.list
+ sudo apt-get update
+ sudo apt-get install -y git docker-engine python-pip
+ sudo pip install docker-compose
+ sudo groupadd docker
+ sudo usermod -aG docker vagrant
+ SHELL
+
end
diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index a4cc096..a2aadd2 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -3,6 +3,11 @@
expose:
- "5432"
+xos_redis:
+ image: redis
+ ports:
+ - "6379:6379"
+
xos_bootstrap_ui:
image: xosproject/xos
# command: sleep 86400
@@ -13,6 +18,7 @@
- "9998:9998"
links:
- xos_db
+ - xos_redis:redis
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro