namespaces to the mainline
This commit is contained in:
parent
f97f763d70
commit
0b21a0402a
@ -14,8 +14,8 @@
|
||||
|
||||
|
||||
class cobbler::distro::centos64_x86_64(
|
||||
$http_iso = 'http://download.mirantis.com/epel-fuel-grizzly/isos/x86_64/CentOS-6.4-x86_64-minimal.iso',
|
||||
$ks_url = 'http://download.mirantis.com/epel-fuel-grizzly'
|
||||
$http_iso = 'http://download.mirantis.com/epel-fuel-grizzly-3.1/isos/x86_64/CentOS-6.4-x86_64-minimal.iso',
|
||||
$ks_url = 'http://download.mirantis.com/epel-fuel-grizzly-3.1'
|
||||
) {
|
||||
|
||||
Exec {path => '/usr/bin:/bin:/usr/sbin:/sbin'}
|
||||
|
@ -32,7 +32,7 @@ class cobbler::profile::centos64_x86_64(
|
||||
},
|
||||
{
|
||||
"name" => "Mirantis-epel-fuel-install",
|
||||
"url" => "http://download.mirantis.com/epel-fuel-grizzly",
|
||||
"url" => "http://download.mirantis.com/epel-fuel-grizzly-3.1",
|
||||
}
|
||||
],
|
||||
|
||||
|
@ -16,7 +16,7 @@ class openstack::mirantis_repos (
|
||||
$fuel_mirrorlist = 'http://download.mirantis.com/epel-fuel-folsom-2.1/mirror.internal-stage.list',
|
||||
$mirrorlist_base = 'http://172.18.67.168/centos-repo/mirror-6.3-os.list',
|
||||
$mirrorlist_updates = 'http://172.18.67.168/centos-repo/mirror-6.3-updates.list',
|
||||
$grizzly_baseurl = 'http://download.mirantis.com/epel-fuel-grizzly',
|
||||
$grizzly_baseurl = 'http://download.mirantis.com/epel-fuel-grizzly-3.1',
|
||||
$enable_test_repo = false,
|
||||
$repo_proxy = undef,
|
||||
$use_upstream_mysql = false,
|
||||
@ -182,9 +182,9 @@ class openstack::mirantis_repos (
|
||||
|
||||
yumrepo { 'openstack-epel-fuel-grizzly':
|
||||
descr => 'Mirantis OpenStack grizzly Custom Packages',
|
||||
baseurl => 'http://download.mirantis.com/epel-fuel-grizzly',
|
||||
baseurl => 'http://download.mirantis.com/epel-fuel-grizzly-3.1',
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'http://download.mirantis.com/epel-fuel-grizzly/mirantis.key',
|
||||
gpgkey => 'http://download.mirantis.com/epel-fuel-grizzly-3.1/mirantis.key',
|
||||
mirrorlist => absent,
|
||||
}
|
||||
|
||||
@ -212,7 +212,7 @@ class openstack::mirantis_repos (
|
||||
|
||||
yumrepo { 'openstack-epel-fuel-grizzly':
|
||||
descr => 'Mirantis OpenStack grizzly Custom Packages',
|
||||
baseurl => 'http://download.mirantis.com/epel-fuel-grizzly/',
|
||||
baseurl => 'http://download.mirantis.com/epel-fuel-grizzly-3.1',
|
||||
gpgcheck => '0',
|
||||
}
|
||||
|
||||
|
@ -41,6 +41,8 @@ class openstack::quantum_router (
|
||||
$enable_tunneling = $tenant_network_type ? { 'gre' => true, 'vlan' => false }
|
||||
$admin_auth_url = "http://${auth_host}:35357/v2.0"
|
||||
|
||||
$use_namespaces = True
|
||||
|
||||
class { '::quantum':
|
||||
bind_host => $api_bind_address,
|
||||
rabbit_user => $rabbit_user,
|
||||
@ -72,7 +74,7 @@ class openstack::quantum_router (
|
||||
}
|
||||
class { 'quantum::agents::dhcp':
|
||||
debug => True,
|
||||
use_namespaces => False,
|
||||
use_namespaces => $use_namespaces,
|
||||
service_provider => $service_provider,
|
||||
auth_url => $admin_auth_url,
|
||||
auth_tenant => 'services',
|
||||
@ -92,7 +94,7 @@ class openstack::quantum_router (
|
||||
auth_tenant => 'services',
|
||||
auth_user => 'quantum',
|
||||
auth_password => $quantum_user_password,
|
||||
use_namespaces => False,
|
||||
use_namespaces => $use_namespaces,
|
||||
metadata_ip => $internal_address,
|
||||
service_provider => $service_provider
|
||||
}
|
||||
|
@ -6,7 +6,7 @@ lang en_US.UTF-8
|
||||
selinux --disabled
|
||||
url --url http://download.mirantis.com/centos-6.4
|
||||
network --bootproto=dhcp
|
||||
repo --name=Mirantis --mirrorlist=http://download.mirantis.com/epel-fuel-grizzly/mirantis.mirror
|
||||
repo --name=Mirantis --mirrorlist=http://download.mirantis.com/epel-fuel-grizzly-3.1/mirantis.mirror
|
||||
keyboard us
|
||||
rootpw r00tme
|
||||
timezone --utc UTC
|
||||
|
Loading…
Reference in New Issue
Block a user