diff options
author | Tim Rozet <trozet@redhat.com> | 2015-05-21 17:05:53 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2015-05-21 17:05:53 -0400 |
commit | 4039d84dfbb40a88c90cc58d3823360c565766d9 (patch) | |
tree | 75d5d6512e88012c0753bc43aeec7e220a45445b /common/puppet-opnfv/manifests/repo.pp | |
parent | e1aaacb9e0fee01838194285ba4a5e52f9f144fe (diff) |
Adds Heat and external network support
Patch changes behavior to do the following
External Network:
- openvswitch is now installed at the beginning of the puppet run
- public interface config is changed to be an ovsport on br-ex
- br-ex is created with the IP address formerly on public interface
- neutron is configured to use br-ex
- after neutron is running, an external provider_network and
provider_subnet are created
New global parameters required (only if external_network_flag is true):
- public_gateway
- public_dns
- public_network
- public_subnet
- public_allocation_start
- public_allocation_end
Heat is now in HA and added to deployment by default:
Introduces 6 new required global params:
- heat_admin_vip
- heat_private_vip
- heat_public_vip
- heat_cfn_admin_vip
- heat_cfn_private_vip
- heat_cfn_public_vip
JIRA: BGS-31
Change-Id: Ic4428b31c2a3028aa46c4da73e4d0f338b6651d3
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'common/puppet-opnfv/manifests/repo.pp')
-rw-r--r-- | common/puppet-opnfv/manifests/repo.pp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/common/puppet-opnfv/manifests/repo.pp b/common/puppet-opnfv/manifests/repo.pp index eb3a2e6..fe89305 100644 --- a/common/puppet-opnfv/manifests/repo.pp +++ b/common/puppet-opnfv/manifests/repo.pp @@ -33,5 +33,35 @@ class opnfv::repo { gpgcheck => 0, } + exec {'disable selinux': + command => '/usr/sbin/setenforce 0', + unless => '/usr/sbin/getenforce | grep Permissive', + } + -> + service { "network": + ensure => "running", + enable => "true", + hasrestart => true, + restart => '/usr/bin/systemctl restart network', + } + -> + service { 'NetworkManager': + ensure => "stopped", + enable => "false", + } + ~> + exec { 'restart-network-presetup': + command => 'systemctl restart network', + path => ["/usr/sbin/", "/usr/bin/"], + refreshonly => 'true', + } + -> + package { 'openvswitch': + ensure => installed, + } + -> + service {'openvswitch': + ensure => 'running', + } } } |