Browse Source

Remove usage of 'use_neutron' sahara option

'use_neutron' deprecated param is removed from puppet-sahara
in [1], this patch cleans it up in packstack.

[1] https://review.openstack.org/#/c/620808

Change-Id: Id1b284afcc8a69464d698f15f7e094bcdfb078fa
yatin 3 months ago
parent
commit
dbb2a9790d
1 changed files with 0 additions and 2 deletions
  1. 0
    2
      packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp

+ 0
- 2
packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp View File

@@ -2,7 +2,6 @@ class packstack::sahara::rabbitmq ()
2 2
 {
3 3
     $sahara_cfg_sahara_db_pw = hiera('CONFIG_SAHARA_DB_PW')
4 4
     $sahara_cfg_sahara_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
5
-    $sahara_cfg_config_neutron_install = hiera('CONFIG_NEUTRON_INSTALL')
6 5
 
7 6
     $kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', $::os_service_default)
8 7
     $kombu_ssl_keyfile = hiera('CONFIG_SAHARA_SSL_KEY', $::os_service_default)
@@ -38,7 +37,6 @@ class packstack::sahara::rabbitmq ()
38 37
     class { '::sahara':
39 38
       database_connection   =>
40 39
         "mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
41
-      use_neutron           => ($sahara_cfg_config_neutron_install == 'y'),
42 40
       host                  => hiera('CONFIG_SAHARA_HOST'),
43 41
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
44 42
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",

Loading…
Cancel
Save