Let neutron::server install *aas when needed

amoralej · amoralej · commit 2b29648d20ef · 2016-06-29T12:36:18.000-04:00
When enabling fwaas, packstack fails because the tags
in the ensure_resource are different that the ones in
puppet-neutron.

Currently neutron::server can take care of packages
installation using ensure_*aas_package. This patch
leverages those parameters instead of doing it as part
of the packstack::neutron::api manifest.

Change-Id: I387d1412e45b73ba89b048f4fe2f7ce97ec4d41f
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -8,40 +8,23 @@
     $neutron_db_password     = hiera('CONFIG_NEUTRON_DB_PW')
     $neutron_sql_connection  = "mysql+pymysql://${neutron_db_user}:${neutron_db_password}@${neutron_db_host}/${neutron_db_name}"
     $neutron_user_password   = hiera('CONFIG_NEUTRON_KS_PW')
+    $neutron_fwaas_enabled   = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
+    $neutron_lbaas_enabled   = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
+    $neutron_vpnaas_enabled  = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
 
     class { '::neutron::server':
-      database_connection => $neutron_sql_connection,
-      auth_password       => $neutron_user_password,
-      auth_uri            => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-      identity_uri        => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
-      sync_db             => true,
-      enabled             => true,
-      api_workers         => hiera('CONFIG_SERVICE_WORKERS'),
-      rpc_workers         => hiera('CONFIG_SERVICE_WORKERS'),
-      service_providers   => hiera_array('SERVICE_PROVIDERS'),
-    }
-
-    # TODO: FIXME: remove this hack after upstream resolves https://bugs.launchpad.net/puppet-neutron/+bug/1474961
-    if hiera('CONFIG_NEUTRON_VPNAAS') == 'y' {
-      ensure_resource( 'package', 'neutron-vpnaas-agent', {
-        name   => 'openstack-neutron-vpnaas',
-        tag    => ['openstack', 'neutron-package'],
-      })
-      Package['neutron-vpnaas-agent'] ~> Service<| tag == 'neutron-service' |>
-    }
-    if hiera('CONFIG_NEUTRON_FWAAS') == 'y' {
-        ensure_resource( 'package', 'neutron-fwaas', {
-          'name'   => 'openstack-neutron-fwaas',
-          'tag'    => 'openstack'
-        })
-      Package['neutron-fwaas'] ~> Service<| tag == 'neutron-service' |>
-    }
-    if hiera('CONFIG_LBAAS_INSTALL') == 'y' {
-      ensure_resource( 'package', 'neutron-lbaas-agent', {
-        name   => 'openstack-neutron-lbaas',
-        tag    => ['openstack', 'neutron-package'],
-      })
-      Package['neutron-lbaas-agent'] ~> Service<| tag == 'neutron-service' |>
+      database_connection   => $neutron_sql_connection,
+      auth_password         => $neutron_user_password,
+      auth_uri              => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
+      identity_uri          => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+      sync_db               => true,
+      enabled               => true,
+      api_workers           => hiera('CONFIG_SERVICE_WORKERS'),
+      rpc_workers           => hiera('CONFIG_SERVICE_WORKERS'),
+      service_providers     => hiera_array('SERVICE_PROVIDERS'),
+      ensure_fwaas_package  => $neutron_fwaas_enabled,
+      ensure_vpnaas_package => $neutron_vpnaas_enabled,
+      ensure_lbaas_package  => $neutron_lbaas_enabled,
     }
 
     file { '/etc/neutron/api-paste.ini':
