Merge "Disabled epel repo, cleaned up environments files"

This commit is contained in:
Zuul 2018-01-31 17:00:06 +00:00 committed by Gerrit Code Review
commit 8f462d6b26
10 changed files with 24 additions and 492 deletions

View File

@ -100,6 +100,9 @@ suites:
# Attributes copied from environments/integration.json
apache:
listen: []
yum:
epel:
enabled: false
openstack:
is_release: true
apt:

View File

@ -22,6 +22,9 @@ provisioner:
# Attributes copied from environments/multinode.json
apache:
listen: []
yum:
epel:
enabled: false
openstack:
is_release: true
apt:

View File

@ -94,6 +94,9 @@ suites:
# Attributes copied from environments/integration-ubuntu16.json
apache:
listen: []
yum:
epel:
enabled: false
openstack:
is_release: true
apt:

View File

@ -1,4 +0,0 @@
{
"name": "_default",
"description": "The default Chef environment"
}

View File

@ -8,6 +8,11 @@
"default_attributes": {
"apache": {
"listen": []
},
"yum": {
"epel": {
"enabled": false
}
}
},
"override_attributes": {

View File

@ -1,90 +0,0 @@
{
"name": "baremetal-aio-neutron",
"description": "Environment used in testing the upstream cookbooks and reference Chef repository with vagrant. To be used with the Vagrantfile-aio-neutron vagrantfile. Defines the necessary attributes for a working all-in-one openstack deployment, using neutron for the networking component, and the openvswitch neutron plugin",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
},
"override_attributes": {
"apache": {
"listen_addresses": [
"<EXTERNAL WEB IP ADDRESS>"
],
"listen_ports": [
"80",
"443"
]
},
"mysql": {
"allow_remote_root": true,
"root_network_acl": [
"%"
]
},
"openstack": {
"mq": {
"user": "admin"
},
"endpoints": {
"bind-host": "<EXTERNAL WEB IP ADDRESS>",
"host": "<EXTERNAL WEB IP ADDRESS>"
},
"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"
}
},
"block-storage": {
"enable_v1_api": "True",
"volume": {
"create_volume_group": true,
"default_volume_type": "lvm"
}
},
"image": {
"image_upload": true,
"upload_images": [
"cirros",
"ubuntu-trusty",
"centos-7"
],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-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": {
"network": {
"service_type": "neutron"
},
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"cpu_mode": "host-passthrough"
}
}
}
}
}

View File

@ -8,6 +8,11 @@
"default_attributes": {
"apache": {
"listen": []
},
"yum": {
"epel": {
"enabled": false
}
}
},
"override_attributes": {

View File

@ -1,130 +0,0 @@
{
"name": "multinode-centos7",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"override_attributes": {
"mariadb": {
"mysqld": {
"lc_messages_dir": "/usr/share/mariadb"
}
},
"openstack": {
"yum": {
"update_yum_cache": true,
"uri": "https://trunk.rdoproject.org/centos7-master/current-passed-ci/",
"gpgcheck": false
},
"sysctl": {
"net.ipv4.ip_forward": 1
},
"endpoints": {
"mq": { "host": "192.168.101.60" },
"admin": {
"identity": { "host": "192.168.101.60" },
"network": { "host": "192.168.101.60" },
"image_api": { "host": "192.168.101.60" },
"image_registry": { "host": "192.168.101.60" },
"block-storage": { "host": "192.168.101.60" },
"compute-api": { "host": "192.168.101.60" },
"compute-metadata-api": { "host": "192.168.101.60" },
"compute-novnc": { "host": "192.168.101.60" },
"orchestration-api": { "host": "192.168.101.60" },
"orchestration-api-cfn": { "host": "192.168.101.60" },
"orchestration-api-cloudwatch": { "host": "192.168.101.60" },
"placement-api": { "host": "192.168.101.60" }
},
"internal": {
"identity": { "host": "192.168.101.60" },
"network": { "host": "192.168.101.60" },
"image_api": { "host": "192.168.101.60" },
"image_registry": { "host": "192.168.101.60" },
"block-storage": { "host": "192.168.101.60" },
"compute-api": { "host": "192.168.101.60" },
"compute-metadata-api": { "host": "192.168.101.60" },
"compute-novnc": { "host": "192.168.101.60" },
"orchestration-api": { "host": "192.168.101.60" },
"orchestration-api-cfn": { "host": "192.168.101.60" },
"orchestration-api-cloudwatch": { "host": "192.168.101.60" },
"placement-api": { "host": "192.168.101.60" }
},
"public": {
"identity": { "host": "192.168.101.60" },
"network": { "host": "192.168.101.60" },
"image_api": { "host": "192.168.101.60" },
"image_registry": { "host": "192.168.101.60" },
"block-storage": { "host": "192.168.101.60" },
"compute-api": { "host": "192.168.101.60" },
"compute-metadata-api": { "host": "192.168.101.60" },
"compute-novnc": { "host": "192.168.101.60" },
"orchestration-api": { "host": "192.168.101.60" },
"orchestration-api-cfn": { "host": "192.168.101.60" },
"orchestration-api-cloudwatch": { "host": "192.168.101.60" },
"placement-api": { "host": "192.168.101.60" }
}
},
"bind_interface": "enp0s8",
"bind_service": {
"mq": { "host": "192.168.101.60" },
"main": {
"identity": { "host": "0.0.0.0" }
},
"admin": {
"identity": { "host": "0.0.0.0" }
},
"all": {
"network": { "host": "0.0.0.0" },
"image_api": { "host": "0.0.0.0" },
"image_registry": { "host": "0.0.0.0" },
"block-storage": { "host": "0.0.0.0" },
"compute-api": { "host": "0.0.0.0" },
"compute-metadata-api": { "host": "0.0.0.0" },
"compute-novnc": { "host": "0.0.0.0" },
"orchestration-api": { "host": "0.0.0.0" },
"orchestration-api-cfn": { "host": "0.0.0.0" },
"orchestration-api-cloudwatch": { "host": "0.0.0.0" },
"placement-api": { "host": "0.0.0.0" }
}
},
"dashboard": {
"server_hostname": "localhost"
},
"mq": {
"user": "admin"
},
"network": {
"plugins": {
"ml2": {
"conf": {
"ml2_type_vxlan": {
"vni_ranges": "65537:69999",
"vxlan_group": "239.1.1.40"
}
}
}
},
"tun_network_bridge_interface": "enp0s8",
"conf": {
"DEFAULT": {
"service_plugins": "router"
},
"oslo_messaging_rabbit": { "rabbit_host": "192.168.101.60" },
"ml2": { "tenant_network_types": "vxlan" }
}
}
},
"image": {
"image_upload": true
},
"compute": {
"conf": {
"libvirt": {
"cpu_type": "none",
"virt_type": "qemu"
},
"oslo_messaging_rabbit": { "rabbit_host": "192.168.101.60" }
}
}
}
}

View File

@ -1,5 +1,5 @@
{
"name": "multinode-ubuntu16",
"name": "multinode",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
@ -8,8 +8,10 @@
"apache": {
"listen": []
},
"apt": {
"compile_time_update" : true
"yum": {
"epel": {
"enabled": false
}
}
},
"override_attributes": {

View File

@ -1,265 +0,0 @@
name 'testing'
description 'Environment used in testing the upstream cookbooks and reference' \
' Chef repository'
override_attributes(
'mysql' => {
'server_root_password' => 'root',
'server_debian_password' => 'root',
'server_repl_password' => 'root',
'allow_remote_root' => true,
'root_network_acl' => '%',
},
'openstack' => {
'auth' => {
'validate_certs' => false,
},
'block-storage' => {
'syslog' => {
'use' => false,
},
'api' => {
'ratelimit' => 'False',
},
'debug' => true,
'image_api_chef_role' => 'os-image',
'identity_service_chef_role' => 'os-identity',
'rabbit_server_chef_role' => 'os-ops-messaging',
},
'compute' => {
'syslog' => {
'use' => false,
},
'libvirt' => {
'bind_interface' => 'eth0',
},
'novnc_proxy' => {
'bind_interface' => 'eth0',
},
'xvpvnc_proxy' => {
'bind_interface' => 'eth0',
},
'image_api_chef_role' => 'os-image',
'identity_service_chef_role' => 'os-identity',
'nova_setup_chef_role' => 'os-compute-api',
'rabbit_server_chef_role' => 'os-ops-messaging',
'ratelimit' => { # Disable ratelimiting so Tempest doesn't have issues.
'api' => {
'enabled' => false,
},
'volume' => {
'enabled' => false,
},
},
'network' => {
'fixed_range' => '10.0.0.0/8',
},
'networks' => [
],
},
'db' => {
'bind_interface' => 'eth0',
'compute' => {
'host' => '10.0.3.10',
},
'identity' => {
'host' => '10.0.3.10',
},
'image' => {
'host' => '10.0.3.10',
},
'network' => {
'host' => '10.0.3.10',
},
'volume' => {
'host' => '10.0.3.10',
},
'dashboard' => {
'host' => '10.0.3.10',
},
'telemetry' => {
'host' => '10.0.3.10',
},
'orchestration' => {
'host' => '10.0.3.10',
},
},
'developer_mode' => true,
'endpoints' => {
'compute-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8774',
'path' => '/v2/%(tenant_id)s',
},
'compute-ec2-admin' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8773',
'path' => '/services/Admin',
},
'compute-ec2-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8773',
'path' => '/services/Cloud',
},
'compute-xvpvnc' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '6081',
'path' => '/console',
},
'compute-novnc' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '6080',
'path' => '/vnc_auto.html',
},
'image-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '9292',
'path' => '/v2',
},
'image-registry' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '9191',
'path' => '/v2',
},
'identity-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '5000',
'path' => '/v2.0',
},
'identity-admin' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '35357',
'path' => '/v2.0',
},
'volume-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8776',
'path' => '/v1/%(tenant_id)s',
},
'telemetry-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8777',
'path' => '/v1',
},
'network-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '9696',
'path' => '/v2',
},
'orchestration-api' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8004',
'path' => '/v1/%(tenant_id)s',
},
'orchestration-api-cfn' => {
'host' => '10.0.3.11',
'scheme' => 'http',
'port' => '8000',
'path' => '/v1',
},
},
'identity' => {
'admin_user' => 'ksadmin',
'bind_interface' => 'eth0',
'catalog' => {
'backend' => 'templated',
},
'debug' => true,
'rabbit_server_chef_role' => 'os-ops-messaging',
'roles' => %w(admin
keystone_admin
keystone_service_admin
member
netadmin
sysadmin),
'syslog' => {
'use' => false,
},
'tenants' => %w(admin service demo),
'token' => {
'backend' => 'memcache',
},
'users' => {
'ksadmin' => {
'password' => 'ksadmin',
'default_tenant' => 'admin',
'roles' => {
# Each key is the role name, each value is a list of tenants
'admin' => [
'admin',
],
'keystone_admin' => [
'admin',
],
'keystone_service_admin' => [
'admin',
],
},
},
'demo' => {
'password' => 'demo',
'default_tenant' => 'demo',
'roles' => {
# Each key is the role name, each value is a list of tenants
'sysadmin' => [
'demo',
],
'netadmin' => [
'demo',
],
'member' => [
'demo',
],
},
},
},
},
'image' => {
'api' => {
'bind_interface' => 'eth0',
},
'debug' => true,
'identity_service_chef_role' => 'os-identity',
'rabbit_server_chef_role' => 'os-ops-messaging',
'registry' => {
'bind_interface' => 'eth0',
},
'syslog' => {
'use' => false,
},
'upload_image' => {
'cirros' => 'http://hypnotoad/cirros-0.3.0-x86_64-disk.img',
},
'upload_images' => [
'cirros',
],
},
'memcached_servers' => [
'10.0.3.10:11211',
],
'mq' => {
'bind_interface' => 'eth0',
'host' => '10.0.3.10',
'user' => 'guest',
'vhost' => '/nova',
},
},
'queue' => {
'host' => '10.0.3.10',
'user' => 'guest',
'vhost' => '/nova',
}
)