openstack
/
openstack-chef
Code Issues Proposed changes

Merge "Adding forwarded_ports for Vagrantfile"

This commit is contained in:
Jenkins 2013-10-29 13:30:33 +00:00 committed by Gerrit Code Review
parent 323843237c 52da1d959d
commit 933bb54c30
3 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Vagrantfile vendored
View File

@ -13,6 +13,11 @@ Vagrant.configure("2") do |config|
# Omnibus plugin configuration
config.omnibus.chef_version = :latest
# Port forwarding rules, for access to openstack services
config.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
config.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
config.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
# OpenStack-related settings
config.vm.network "private_network", ip: "33.33.33.60"
config.vm.network "private_network", ip: "192.168.100.60"

71
environments/vagrant.json
View File

@ -1,71 +0,0 @@
{
"name": "vagrant",
"description": "Environment used in testing with Vagrant the upstream cookbooks and reference Chef repository. Defines the network and database settings to use with OpenStack. The networks will be used in the libraries provided by the osops-utils cookbook. This example is for FlatDHCP with 2 physical networks.",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
},
"override_attributes": {
"packages": [
"avahi-daemon",
"libxslt1-dev",
"libxml2-dev"
],
"mysql": {
"allow_remote_root": true,
"root_network_acl": "%"
},
"openstack": {
"developer_mode": true,
"identity": {
"bind_interface": "lo"
},
"image": {
"image_upload": false,
"upload_images": ["cirros"],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
},
"identity_service_chef_role": "allinone-compute"
},
"block-storage": {
"keystone_service_chef_role": "allinone-compute"
},
"dashboard": {
"keystone_service_chef_role": "allinone-compute"
},
"network": {
"rabbit_server_chef_role": "allinone-compute"
},
"compute": {
"identity_service_chef_role": "allinone-compute",
"network": {
"fixed_range": "192.168.100.0/24",
"public_interface": "eth2"
},
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
},
"networks": [
{
"label": "public",
"ipv4_cidr": "192.168.100.0/24",
"num_networks": "1",
"network_size": "255",
"bridge": "br100",
"bridge_dev": "eth2",
"dns1": "8.8.8.8",
"dns2": "8.8.4.4"
}
]
}
}
}
}

59
environments/vagrant.rb Normal file
View File

@ -0,0 +1,59 @@
name "vagrant"
description "Environment used in testing with Vagrant the upstream cookbooks and reference Chef repository. Defines the network and database settings to use with OpenStack. The networks will be used in the libraries provided by the osops-utils cookbook. This example is for FlatDHCP with 2 physical networks."
override_attributes(
"mysql" => {
"allow_remote_root" => true,
"root_network_acl" => "%"
},
"openstack" => {
"developer_mode" => true,
"identity" => {
"catalog" => {
"backend" => "templated"
},
},
"image" => {
"image_upload" => false,
"upload_images" => ["cirros"],
"upload_image" => {
"cirros" => "https =>//launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
},
"identity_service_chef_role" => "allinone-compute"
},
"block-storage" => {
"keystone_service_chef_role" => "allinone-compute"
},
"dashboard" => {
"keystone_service_chef_role" => "allinone-compute"
},
"network" => {
"rabbit_server_chef_role" => "allinone-compute"
},
"compute" => {
"identity_service_chef_role" => "allinone-compute",
"network" => {
"fixed_range" => "192.168.100.0/24",
"public_interface" => "eth2"
},
"config" => {
"ram_allocation_ratio" => 5.0
},
"libvirt" => {
"virt_type" => "qemu"
},
"networks" => [
{
"label" => "public",
"ipv4_cidr" => "192.168.100.0/24",
"num_networks" => "1",
"network_size" => "255",
"bridge" => "br100",
"bridge_dev" => "eth2",
"dns1" => "8.8.8.8",
"dns2" => "8.8.4.4"
}
]
}
}
)