openstack
/
openstack-chef
Code Issues Proposed changes

Update centos environments to catch up 

Many changes have gone in to the ubuntu environments, this
catches up the centos ones.

Change-Id: Ib68cab13e33f44aff1a176028161f0e3005bab52
This commit is contained in:
Mark Vanderwiel 2015-08-11 11:51:30 -05:00
parent d93ee7c58f
commit 6f2718a65b
4 changed files with 28 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
environments/vagrant-aio-centos7-neutron.json
View File

@ -8,37 +8,25 @@
"default_attributes": {
},
"override_attributes": {
"mysql": {
"allow_remote_root": true,
"root_network_acl": ["%"]
},
"openstack": {
"mq": {
"user": "admin"
"yum": {
"rdo_delorean_enabled": true
},
"endpoints": {
"bind-host": "0.0.0.0",
"host": "0.0.0.0",
"identity-bind": {
"host": "0.0.0.0"
},
"bind-host": "0.0.0.0"
}
},
"mq": {
"user": "admin"
},
"network": {
"service_plugins": [ "neutron.services.l3_router.l3_router_plugin.L3RouterPlugin" ],
"dhcp": {
"enable_isolated_metadata": "True"
},
"openvswitch": {
"tunnel_id_ranges": "1:1000",
"enable_tunneling": "True",
"tunnel_type": "gre",
"tenant_network_type": "gre"
},
"api": {
"bind_interface": "enp0s8"
},
"quota": {
"floatingip": "50"
},
"l3":{
"external_network_bridge_interface": "enp0s8"
}
@ -62,9 +50,6 @@
"network": {
"service_type": "neutron"
},
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
}

4
environments/vagrant-aio-centos7-nova.json
View File

@ -24,12 +24,12 @@
"upload_images": [
"cirros",
"ubuntu-trusty",
"fedora"
"centos-7"
],
"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"
"centos-7": "http://cloud.centos.org/centos/7/devel/CentOS-7-x86_64-GenericCloud.qcow2"
}
},
"block-storage": {

60
environments/vagrant-multi-centos7-neutron.json
View File

@ -8,58 +8,27 @@
"default_attributes": {
},
"override_attributes": {
"mysql": {
"allow_remote_root": true,
"root_network_acl": ["%"]
},
"openstack": {
"mq": {
"user": "admin"
},
"identity": {
"bind_interface": "enp0s8"
"yum": {
"rdo_delorean_enabled": true
},
"endpoints": {
"host": "192.168.100.60",
"bind-host": "192.168.100.60",
"mq": {
"host": "192.168.100.60"
"bind_interface": "enp0s8",
"compute-vnc-bind": {
"host": "0.0.0.0"
},
"db": {
"host": "192.168.100.60"
},
"image-api-bind":{
"host": "192.168.100.60"
},
"image-api":{
"host": "192.168.100.60"
},
"compute-vnc-bind":{
"host": "0.0.0.0",
"bind_interface": "enp0s8"
},
"compute-vnc":{
"host": "0.0.0.0",
"bind_interface": "enp0s8"
"compute-vnc": {
"host": "0.0.0.0"
}
},
"mq": {
"user": "admin"
},
"network": {
"service_plugins": [ "neutron.services.l3_router.l3_router_plugin.L3RouterPlugin" ],
"dhcp": {
"enable_isolated_metadata": "True"
},
"openvswitch": {
"tunnel_id_ranges": "1:1000",
"enable_tunneling": "True",
"tunnel_type": "gre",
"tenant_network_type": "gre"
},
"api": {
"bind_interface": "enp0s8"
},
"quota": {
"floatingip": "50"
},
"l3":{
"external_network_bridge_interface": "enp0s8"
}
@ -71,12 +40,6 @@
}
},
"image": {
"api": {
"bind_interface": "enp0s8"
},
"registry": {
"bind_interface": "enp0s8"
},
"image_upload": true,
"upload_images": [
"cirros"
@ -97,9 +60,6 @@
"network": {
"public_interface": "enp0s8",
"service_type": "neutron"
},
"config": {
"ram_allocation_ratio": 5.0
}
}
}

45
environments/vagrant-multi-centos7-nova.json
View File

@ -8,49 +8,20 @@
"default_attributes": {
},
"override_attributes": {
"yum": {
"repo": {
"baseurl": "https://repos.fedorapeople.org/repos/openstack/openstack-kilo/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": {
"rdo_delorean_enabled": true
},
"mq": {
"user": "admin"
},
"yum": {
"uri": "https://repos.fedorapeople.org/repos/openstack/openstack-kilo/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"
},
"bind-interface": "enp0s8",
"compute-vnc-bind":{
"host": "0.0.0.0"
}
},
"image": {
"api": {
"bind_interface": "enp0s8"
},
"registry": {
"bind_interface": "enp0s8"
},
"image_upload": true,
"upload_images": [
"cirros",
@ -59,7 +30,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",
"ubuntu-trusty": "http://uec-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"
}
},
@ -70,9 +41,6 @@
}
},
"compute": {
"libvirt": {
"virt_type": "qemu"
},
"network": {
"public_interface": "enp0s3",
"service_type": "nova",
@ -82,6 +50,9 @@
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
},
"networks": [
{
"label": "public",