"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devstack/Vagrantfile" between
monasca-log-api-2.7.0.tar.gz and monasca-log-api-2.9.0.tar.gz

About: OpenStack Monasca Log API is a RESTful API server acting as gateway for logs collected from log-agents.
The "Stein" series (maintained release).

Vagrantfile  (monasca-log-api-2.7.0):Vagrantfile  (monasca-log-api-2.9.0)
skipping to change at line 18 skipping to change at line 18
config.proxy.https = ENV['https_proxy'] if ENV['https_proxy'] config.proxy.https = ENV['https_proxy'] if ENV['https_proxy']
if ENV['no_proxy'] if ENV['no_proxy']
local_no_proxy = ",192.168.10.6,10.0.2.15" local_no_proxy = ",192.168.10.6,10.0.2.15"
config.proxy.no_proxy = ENV['no_proxy'] + local_no_proxy config.proxy.no_proxy = ENV['no_proxy'] + local_no_proxy
end end
end end
config.ssh.forward_agent = true config.ssh.forward_agent = true
config.vm.hostname = "devstack" config.vm.hostname = "devstack"
config.vm.box = "bento/ubuntu-16.04" config.vm.box = "bento/ubuntu-18.04"
config.vm.network "private_network",ip:"192.168.10.6" config.vm.network "private_network",ip:"192.168.10.6"
config.vm.synced_folder "~/", "/vagrant_home" config.vm.synced_folder "~/", "/vagrant_home"
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
vb.gui = false vb.gui = false
vb.memory = "12800" vb.memory = "12800"
vb.cpus = 4 vb.cpus = 4
end end
config.vm.provision "shell", privileged: false, inline: <<-SHELL config.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt-get -y install git sudo apt-get -y install git
if [ $http_proxy ]; then if [ $http_proxy ]; then
git config --global url.https://git.openstack.org/.insteadOf git://git.ope git config --global url.https://git.openstack.org/.insteadOf https://git.o
nstack.org/ penstack.org/
sudo git config --global url.https://git.openstack.org/.insteadOf git://gi sudo git config --global url.https://git.openstack.org/.insteadOf https://
t.openstack.org/ git.openstack.org/
protocol=`echo $http_proxy | awk -F: '{print $1}'` protocol=`echo $http_proxy | awk -F: '{print $1}'`
host=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $1}'` host=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $1}'`
port=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $2}'` port=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $2}'`
echo "<settings> echo "<settings>
<proxies> <proxies>
<proxy> <proxy>
<id>$host</id> <id>$host</id>
<active>true</active> <active>true</active>
skipping to change at line 116 skipping to change at line 116
# Uncomment one of the following two lines to choose either InfluxDB or Vertica. # Uncomment one of the following two lines to choose either InfluxDB or Vertica.
# MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-vertica} # MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-vertica}
# MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-cassandra} # MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-cassandra}
MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-influxdb} MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-influxdb}
# Uncomment following line to deploy monasca-log-api with Apache # Uncomment following line to deploy monasca-log-api with Apache
# MONASCA_LOG_API_USE_MOD_WSGI=True # MONASCA_LOG_API_USE_MOD_WSGI=True
# Uncomment one of the following lines and modify accordingly to enable the Mona sca DevStack Plugin # Uncomment one of the following lines and modify accordingly to enable the Mona sca DevStack Plugin
enable_plugin monasca-api https://git.openstack.org/openstack/monasca-api enable_plugin monasca-api https://git.openstack.org/openstack/monasca-api.git
enable_plugin monasca-log-api https://git.openstack.org/openstack/monasca-log-ap i.git enable_plugin monasca-log-api https://git.openstack.org/openstack/monasca-log-ap i.git
' > local.conf ' > local.conf
./stack.sh ./stack.sh
SHELL SHELL
end end
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)