Minor fixes for FWaaS plugin
- remove CentOS from releases - removed simple mode support - check L3 agent presence as it's more reliable Change-Id: Ic3e2323a3dd763c27baa144be38be030758fa94c
This commit is contained in:
parent
9c9f1ac415
commit
c7ce52d6a5
|
@ -12,8 +12,8 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
Facter.add('is_vpn_enabled') do
|
Facter.add('is_l3_enabled') do
|
||||||
setcode do
|
setcode do
|
||||||
Facter::Util::Resolution.exec("pcs status xml | grep ocf-neutron-vpn-agent | egrep -o Started -m 1")
|
Facter::Util::Resolution.exec("pcs status xml | grep ocf-neutron-l3-agent | egrep -o Started -m 1")
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -17,20 +17,20 @@
|
||||||
class fwaas::params {
|
class fwaas::params {
|
||||||
|
|
||||||
$ha = hiera('deployment_mode') ? { 'ha_compact'=>true, default=>false }
|
$ha = hiera('deployment_mode') ? { 'ha_compact'=>true, default=>false }
|
||||||
$vpn_enabled = $::is_vpn_enabled ? { 'Started'=>true, default=>false }
|
$l3_enabled = $::is_l3_enabled ? { 'Started'=>true, default=>false }
|
||||||
|
|
||||||
$server_service = 'neutron-server'
|
$server_service = 'neutron-server'
|
||||||
|
|
||||||
if($vpn_enabled) {
|
if($l3_enabled) {
|
||||||
|
|
||||||
$l3_agent_service = 'neutron-vpn-agent'
|
|
||||||
$p_l3_agent = 'p_neutron-vpn-agent'
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$l3_agent_service = 'neutron-l3-agent'
|
$l3_agent_service = 'neutron-l3-agent'
|
||||||
$p_l3_agent = 'p_neutron-l3-agent'
|
$p_l3_agent = 'p_neutron-l3-agent'
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$l3_agent_service = 'neutron-vpn-agent'
|
||||||
|
$p_l3_agent = 'p_neutron-vpn-agent'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($::osfamily == 'Redhat') {
|
if($::osfamily == 'Redhat') {
|
||||||
|
|
|
@ -21,14 +21,9 @@ groups: ['network']
|
||||||
releases:
|
releases:
|
||||||
- os: ubuntu
|
- os: ubuntu
|
||||||
version: 2015.1-7.0
|
version: 2015.1-7.0
|
||||||
mode: ['ha', 'multinode']
|
mode: ['ha']
|
||||||
deployment_scripts_path: deployment_scripts/
|
deployment_scripts_path: deployment_scripts/
|
||||||
repository_path: repositories/ubuntu
|
repository_path: repositories/ubuntu
|
||||||
- os: centos
|
|
||||||
version: 2015.1-7.0
|
|
||||||
mode: ['ha', 'multinode']
|
|
||||||
deployment_scripts_path: deployment_scripts/
|
|
||||||
repository_path: repositories/centos
|
|
||||||
|
|
||||||
# Version of plugin package
|
# Version of plugin package
|
||||||
package_version: '2.0.0'
|
package_version: '2.0.0'
|
||||||
|
|
Loading…
Reference in New Issue