From 4039d84dfbb40a88c90cc58d3823360c565766d9 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 May 2015 17:05:53 -0400 Subject: 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 --- common/puppet-opnfv/manifests/repo.pp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'common/puppet-opnfv/manifests/repo.pp') 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', + } } } -- cgit 1.2.3-korg