diff --git a/Vagrantfile b/Vagrantfile index daacbb2..ae7b60e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,26 +18,4 @@ Vagrant.configure("2") do |config| end end - config.vm.define "dev" do |dev| - dev.vm.box = "precise64" - dev.vm.box_url = "http://files.vagrantup.com/precise64.box" - dev.vm.network "forwarded_port", guest: 22, host: 2202, host_ip: '0.0.0.0' - dev.vm.network "forwarded_port", guest: 5000, host: 5000, host_ip: '0.0.0.0' - dev.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: '0.0.0.0' - dev.vm.network "forwarded_port", guest: 35357, host: 35357, host_ip: '0.0.0.0' - dev.vm.network :private_network, ip: "192.168.26.100" - dev.vm.network :private_network, ip: "172.24.4.225", :netmask => "255.255.255.224", :auto_config => false - dev.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--memory", "2048"] - vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] - end - dev.vm.provision "ansible" do |ansible| - ansible.host_key_checking = false - ansible.playbook = "devstack.yaml" - ansible.verbose = "vv" - end - dev.vm.provision :shell, :inline => "cd devstack; sudo -u vagrant env HOME=/home/vagrant ./stack.sh" - dev.vm.provision :shell, :inline => "ovs-vsctl add-port br-ex eth2" - end - end diff --git a/devstack.yaml b/devstack.yaml deleted file mode 100644 index aa4cec5..0000000 --- a/devstack.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: dev - vars: - devstack_repo: git://github.com/openstack-dev/devstack.git - public_ip: 192.168.26.101 - - tasks: - - name: install packages - apt: "pkg={{ item }} update_cache=yes" - sudo: True - with_items: - - git - - - name: checkout devstack - git: "repo={{ devstack_repo }} dest=/home/vagrant/devstack version=stable/grizzly" - - - name: localrc - template: src=localrc dest=/home/vagrant/devstack/localrc - - - name: source openrc in profile - lineinfile: dest=/home/vagrant/.profile regexp=".*openrc" line='. /home/vagrant/devstack/openrc' - - - name: enable eth2 - command: ip link set dev eth2 up - sudo: True - diff --git a/localrc b/localrc deleted file mode 100644 index 9c68ac5..0000000 --- a/localrc +++ /dev/null @@ -1,28 +0,0 @@ -# Default passwords -ADMIN_PASSWORD=password -MYSQL_PASSWORD=password -RABBIT_PASSWORD=password -SERVICE_PASSWORD=password -SERVICE_TOKEN=password - - -SCREEN_LOGDIR=/opt/stack/logs - - -HOST_IP={{ public_ip }} - -# -# Neutron configs -# -# https://wiki.openstack.org/wiki/NeutronDevstack -disable_service n-net -enable_service q-svc -enable_service q-agt -enable_service q-dhcp -enable_service q-l3 -enable_service q-meta -enable_service neutron - -# Disable security groups entirely -Q_USE_SECGROUP=False -LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver diff --git a/run_vagrant_provision.sh b/run_vagrant_provision.sh index f1722f0..5f31654 100755 --- a/run_vagrant_provision.sh +++ b/run_vagrant_provision.sh @@ -18,5 +18,4 @@ vagrant up --no-provision # but run provision tasks in parallel cat <