Skip to content

Commit

Permalink
Merge pull request #33 from jjasghar/centos7
Browse files Browse the repository at this point in the history
Centos7
  • Loading branch information
kramvan1 committed Feb 24, 2015
2 parents 501e450 + 56dedbe commit c6da95b
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 0 deletions.
1 change: 1 addition & 0 deletions aio-nova.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
role 'allinone-compute'
role 'os-image-upload'
recipe 'openstack-common::openrc'
# if you would like to use centos7 you'll need to use 'vagrant-aio-centos7-nova' for the environment
chef_environment 'vagrant-aio-nova'
file('/etc/chef/openstack_data_bag_secret',
"#{File.dirname(__FILE__)}/.chef/encrypted_data_bag_secret")
Expand Down
56 changes: 56 additions & 0 deletions environments/vagrant-aio-centos7-nova.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"name": "vagrant-aio-centos7-nova",
"description": "Environment used in testing the upstream cookbooks and reference Chef repository with vagrant. To be used with the Vagrantfile-aio-nova vagrantfile. Defines the necessary attributes for a working all-in-one openstack deployment, using nova-network for the networking component",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
},
"override_attributes": {
"openstack": {
"endpoints": {
"bind-host": "0.0.0.0",
"host": "0.0.0.0"
},
"image": {
"image_upload": true,
"upload_images": [
"cirros",
"ubuntu-trusty",
"fedora"
],
"upload_image": {
"cirros": "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img",
"ubuntu-trusty": "http://uec-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img",
"fedora": "http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2"
}
},
"compute": {
"network": {
"public_interface": "enp0s3",
"service_type": "nova"
},
"enabled_apis": "ec2,osapi_compute",
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
},
"networks": [
{
"label": "public",
"ipv4_cidr": "192.168.10.0/24",
"num_networks": "1",
"network_size": "255",
"bridge": "br100",
"bridge_dev": "enp0s8",
"dns1": "8.8.8.8",
"dns2": "8.8.4.4"
}
]
}
}
}
}
1 change: 1 addition & 0 deletions environments/vagrant-aio-nova.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"public_interface": "eth0",
"service_type": "nova"
},
"enabled_apis": "ec2,osapi_compute",
"config": {
"ram_allocation_ratio": 5.0
},
Expand Down
92 changes: 92 additions & 0 deletions environments/vagrant-multi-centos7-nova.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"name": "vagrant-multi-centos7-nova",
"description": "Environment used in testing the upstream cookbooks and reference Chef repository with vagrant. To be used with the Vagrantfile-multi-neutron vagrantfile. Defines the necessary attributes for a working mutltinode (1 controller/n computes) openstack deployment, using neutron (with gre tunnels between hosts) for the networking component.",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
},
"override_attributes": {
"yum": {
"repo": {
"baseurl": "https://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7"
},
"epel": {
"mirrorlist": "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=$basearch",
"gpgkey": "http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7"
}
},
"mysql": {
"allow_remote_root": true,
"root_network_acl": ["%"]
},
"openstack": {
"yum": {
"uri": "https://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7"
},
"identity": {
"bind_interface": "enp0s8"
},
"endpoints": {
"bind-host": "10.0.1.60",
"host": "10.0.1.60",
"mq": {
"host": "10.0.1.60"
},
"db": {
"host": "10.0.1.60"
},
"compute-vnc-bind":{
"host": "0.0.0.0"
}
},
"image": {
"api": {
"bind_interface": "enp0s8"
},
"registry": {
"bind_interface": "enp0s8"
},
"image_upload": true,
"upload_images": [
"cirros",
"ubuntu-trusty",
"centos-7"
],
"upload_image": {
"cirros": "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img",
"ubuntu-trusty": "https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img",
"centos-7": "http://cloud.centos.org/centos/7/devel/CentOS-7-x86_64-GenericCloud.qcow2"
}
},
"compute": {
"libvirt": {
"virt_type": "qemu"
},
"network": {
"public_interface": "enp0s3",
"service_type": "nova",
"multi_host": "true"
},
"enabled_apis": "ec2,osapi_compute",
"config": {
"ram_allocation_ratio": 5.0
},
"networks": [
{
"label": "public",
"ipv4_cidr": "10.0.1.0/24",
"num_networks": "1",
"network_size": "254",
"bridge": "br100",
"bridge_dev": "enp0s8",
"dns1": "8.8.8.8",
"dns2": "8.8.4.4",
"multi_host": "T"
}
]
}
}
}
}
2 changes: 2 additions & 0 deletions multi-nova.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
role 'os-network-metadata-agent'
role 'os-network-server'
recipe 'openstack-common::openrc'
# if you would like to use centos7 you'll need to use 'vagrant-multi-centos7-nova' for the environment
chef_environment 'vagrant-multi-nova'
file('/etc/chef/openstack_data_bag_secret',
"#{File.dirname(__FILE__)}/.chef/encrypted_data_bag_secret")
Expand All @@ -50,6 +51,7 @@
config.vm.network "private_network", ip: "192.168.200.#{ip_suff}"
ENDCONFIG
role 'os-compute-worker'
# if you would like to use centos7 you'll need to use 'vagrant-multi-centos7-nova' for the environment
chef_environment 'vagrant-multi-nova'
file('/etc/chef/openstack_data_bag_secret',
"#{File.dirname(__FILE__)}/.chef/encrypted_data_bag_secret")
Expand Down
1 change: 1 addition & 0 deletions vagrant_linux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@

with_driver "vagrant:#{File.dirname(__FILE__)}/vms"
with_machine_options vagrant_options: {
# if you would like to use centos7 you'll need to update the chef_environment in the main recipe files (aio or multi _nova)
'vm.box' => 'ubuntu14'
}

0 comments on commit c6da95b

Please sign in to comment.