Second vip added: neutron for controller

manifests/profile/neutron/common.pp

@@ -10,8 +10,9 @@ class iaas::profile::neutron::common (
   $debug = hiera('iaas::debug', undef),
 
   $region = hiera('iaas::region', undef),
-  $endpoint = hiera('iaas::role::endpoint::main_address', undef),
+
 ##rhosts
+  $endpoint = hiera('iaas::role::endpoint::main_address', undef),
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),

manifests/profile/neutron/server.pp

@@ -6,7 +6,10 @@ class iaas::profile::neutron::server (
   $nova_password = hiera('iaas::profile::nova::controller::password', undef),
 
   $region = hiera('iaas::region', undef),
-  $endpoint = hiera('iaas::role::endpoint::main_address', undef),
+#VIP1
+  $endpoint_main = hiera('iaas::main_address', undef),
+#VIP2
+  $endpoint_admin = hiera('iaas::admin_address', undef),
 ) {
   include iaas::resources::connectors
 
@@ -16,10 +19,10 @@ class iaas::profile::neutron::server (
   include iaas::profile::neutron::common
 
   class { '::neutron::server':
-    auth_host => $endpoint,
-    auth_uri => "http://${endpoint}:5000/v2.0",
+    auth_host => $endpoint_admin,
+    auth_uri => "http://${endpoint_main}:5000/v2.0",
 ##identity_uri set to be added in next OS release
-#    identity_uri => "http://${endpoint}:35357",
+#    identity_uri => "http://${endpoint_admin}:35357",
     auth_password => $neutron_password,
     database_connection => $iaas::resources::connectors::neutron,
     enabled => true,
@@ -29,21 +32,22 @@ class iaas::profile::neutron::server (
     l3_ha => false,
   }
 
-  neutron_config { 'DEFAULT/allow_automatic_l3agent_failover' :
-    value => "True",
+  neutron_config { 
+    'DEFAULT/allow_automatic_l3agent_failover' : value => "True";
+    'keystone_authtoken/identity_uri' :value => "http://${endpoint_admin}:35357";
   }
 
   class { '::neutron::keystone::auth':
     password => $neutron_password,
-    public_address => $endpoint,
-    admin_address => $endpoint,
-    internal_address => $endpoint,
+    public_address => $endpoint_main,
+    admin_address => $endpoint_admin,
+    internal_address => $endpoint_admin,
     region => $region,
   }
 
   class { '::neutron::server::notifications':
-    nova_url => "http://${endpoint}:8774/v2",
-    nova_admin_auth_url => "http://${endpoint}:35357/v2.0",
+    nova_url => "http://${endpoint_admin}:8774/v2",
+    nova_admin_auth_url => "http://${endpoint_admin}:35357/v2.0",
     nova_admin_password => $nova_password,
     nova_region_name => $region,
     nova_admin_tenant_name => "services",