Kuryr Vagrant Diff

C02FT164DDR4:vagrant mestery$ cat ~/kuryr_vagrant.diff 
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.gitreview b/.gitreview
old mode 100644
new mode 100755
diff --git a/.testr.conf b/.testr.conf
old mode 100644
new mode 100755
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
old mode 100644
new mode 100755
diff --git a/HACKING.rst b/HACKING.rst
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/MANIFEST.in b/MANIFEST.in
old mode 100644
new mode 100755
diff --git a/README.rst b/README.rst
old mode 100644
new mode 100755
diff --git a/__init__.py b/__init__.py
old mode 100644
new mode 100755
diff --git a/babel.cfg b/babel.cfg
old mode 100644
new mode 100755
diff --git a/contrib/vagrant/README.md b/contrib/vagrant/README.md
old mode 100644
new mode 100755
diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile
old mode 100644
new mode 100755
index eb3dfd1..fc10769
--- a/contrib/vagrant/Vagrantfile
+++ b/contrib/vagrant/Vagrantfile
@@ -8,10 +8,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.hostname = "devstack"
 
+  #config.ssh.host = "192.168.56.56"
+  #config.ssh.port = "22"
+
   config.vm.provider "virtualbox" do |vb|
-    vb.customize ["modifyvm", :id, "--memory", "4096"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--memory", "2526"]
+    vb.customize ["modifyvm", :id, "--cpuexecutioncap", "75"]
   end
 
+  #config.vm.network "private_network", ip: "192.168.50.50",
+  #  virtualbox__intnet: true
+  config.vm.network "private_network", :ip => "192.168.56.56", :name => "vboxnet0"
+
   config.vm.provision :shell, :path => "vagrant.sh"
 
   if Vagrant.has_plugin?("vagrant-cachier")
diff --git a/contrib/vagrant/config/kuryr_rc b/contrib/vagrant/config/kuryr_rc
old mode 100644
new mode 100755
diff --git a/contrib/vagrant/config/localrc b/contrib/vagrant/config/localrc
old mode 100644
new mode 100755
index 80ec2a2..10b6c77
--- a/contrib/vagrant/config/localrc
+++ b/contrib/vagrant/config/localrc
@@ -6,13 +6,14 @@ DATABASE_PASSWORD=pass
 RABBIT_PASSWORD=pass
 SERVICE_PASSWORD=pass
 SERVICE_TOKEN=pass
-HOST_IP=127.0.0.1
+HOST_IP=192.168.56.56
+SERVICE_HOST=192.168.56.56
 ENABLED_SERVICES=True
 # Ensure we are using neutron networking rather than nova networking
 # (Neutron is enabled by default since Kilo)
 disable_service n-net
 enable_service q-svc
-enable_service q-agt
+#enable_service q-agt
 enable_service q-dhcp
 enable_service q-l3
 enable_service q-meta
@@ -20,10 +21,16 @@ enable_service neutron
 enable_service key
 enable_service mysql
 enable_service rabbit
+enable_service horizon
+enable_service n-api
+enable_service n-cond
+enable_service n-sch
 
 # Log all output to files
 LOGFILE=$HOME/devstack.log
 SCREEN_LOGDIR=$HOME/logs
 
-
-
+enable_plugin networking-ovn http://git.openstack.org/openstack/networking-ovn
+enable_service ovn-northd
+enable_service ovn-controller
+disable_service q-agt
diff --git a/contrib/vagrant/devstack.sh b/contrib/vagrant/devstack.sh
index 13a92c5..bb4a905 100755
--- a/contrib/vagrant/devstack.sh
+++ b/contrib/vagrant/devstack.sh
@@ -29,7 +29,26 @@ then
 
 fi
 
+# Copy kuryr.sh in
+echo "copy kuryr.sh from $BASEPATH/config/kuryr.sh to $PWD"
+cp "$BASHPATH"/config/kuryr.sh "$PWD"/kuryr.sh
+
+# Remove problematic docker apparmor file
+sudo rm -f /etc/apparmor.d/docker
+
+# Configure br-ex as up
+sudo ip link set br-ex up
 
 # start devstack
 echo "Start Devstack"
 su "$OS_USER" -c "cd $DEVSTACK && ./stack.sh"
+
+# Create neutron subnet-pool for Kuryr
+su "$OS_USER" -c "cd $DEVSTACK && . ./openrc admin admin && neutron subnetpool-create --default-prefix 24 --pool-prefix 10.10.10.0/24 kuryr"
+
+# Install pyroute2
+sudo -H pip install pyroute2
+
+# Setup the ports correctly
+sudo ifconfig eth1 up 0.0.0.0
+sudo ovs-vsctl add-port br-ex eth1
diff --git a/contrib/vagrant/docker.sh b/contrib/vagrant/docker.sh
index 5c41e73..ba92227 100755
--- a/contrib/vagrant/docker.sh
+++ b/contrib/vagrant/docker.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-su "$OS_USER" -c "curl -sSL https://experimental.docker.com/ | sh"
+if [ ! -f "docker-engine_1.9.0~dev~git20150924.164351.0.1e514de-0~trusty_amd64.deb" ]; then
+    wget "https://apt.dockerproject.org/repo/pool/experimental/d/docker-engine/docker-engine_1.9.0~dev~git20150924.164351.0.1e514de-0~trusty_amd64.deb"
+fi
+sudo dpkg -i docker-engine_1.9.0~dev~git20150924.164351.0.1e514de-0~trusty_amd64.deb
+#su "$OS_USER" -c "curl -sSL https://experimental.docker.com/ | sh"
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
old mode 100644
new mode 100755
diff --git a/doc/source/devref/goals_and_use_cases.rst b/doc/source/devref/goals_and_use_cases.rst
old mode 100644
new mode 100755
diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst
old mode 100644
new mode 100755
diff --git a/doc/source/devref/libnetwork_remote_driver_design.rst b/doc/source/devref/libnetwork_remote_driver_design.rst
old mode 100644
new mode 100755
diff --git a/doc/source/index.rst b/doc/source/index.rst
old mode 100644
new mode 100755
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
old mode 100644
new mode 100755
diff --git a/doc/source/readme.rst b/doc/source/readme.rst
old mode 100644
new mode 100755
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
old mode 100644
new mode 100755
diff --git a/etc/README-config.txt b/etc/README-config.txt
old mode 100644
new mode 100755
diff --git a/etc/kuryr-config-generator.conf b/etc/kuryr-config-generator.conf
old mode 100644
new mode 100755
diff --git a/etc/kuryr.json b/etc/kuryr.json
old mode 100644
new mode 100755
diff --git a/kuryr/__init__.py b/kuryr/__init__.py
old mode 100644
new mode 100755
diff --git a/kuryr/common/__init__.py b/kuryr/common/__init__.py
old mode 100644
new mode 100755
diff --git a/kuryr/common/config.py b/kuryr/common/config.py
old mode 100644
new mode 100755
diff --git a/kuryr/common/constants.py b/kuryr/common/constants.py
old mode 100644
new mode 100755
diff --git a/kuryr/common/exceptions.py b/kuryr/common/exceptions.py
old mode 100644
new mode 100755
diff --git a/kuryr/controllers.py b/kuryr/controllers.py
old mode 100644
new mode 100755
diff --git a/kuryr/i18n.py b/kuryr/i18n.py
old mode 100644
new mode 100755
diff --git a/kuryr/opts.py b/kuryr/opts.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/__init__.py b/kuryr/schemata/__init__.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/commons.py b/kuryr/schemata/commons.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/endpoint_create.py b/kuryr/schemata/endpoint_create.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/endpoint_delete.py b/kuryr/schemata/endpoint_delete.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/join.py b/kuryr/schemata/join.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/network_create.py b/kuryr/schemata/network_create.py
old mode 100644
new mode 100755
diff --git a/kuryr/schemata/network_delete.py b/kuryr/schemata/network_delete.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/__init__.py b/kuryr/tests/__init__.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/base.py b/kuryr/tests/base.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_config.py b/kuryr/tests/test_config.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_join.py b/kuryr/tests/test_join.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_kuryr.py b/kuryr/tests/test_kuryr.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_kuryr_endpoint.py b/kuryr/tests/test_kuryr_endpoint.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_kuryr_network.py b/kuryr/tests/test_kuryr_network.py
old mode 100644
new mode 100755
diff --git a/kuryr/tests/test_utils.py b/kuryr/tests/test_utils.py
old mode 100644
new mode 100755
diff --git a/kuryr/utils.py b/kuryr/utils.py
old mode 100644
new mode 100755
diff --git a/openstack-common.conf b/openstack-common.conf
old mode 100644
new mode 100755
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
diff --git a/setup.cfg b/setup.cfg
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
diff --git a/test-requirements.txt b/test-requirements.txt
old mode 100644
new mode 100755
diff --git a/tox.ini b/tox.ini
old mode 100644
new mode 100755
C02FT164DDR4:vagrant mestery$