Closes-Bug: #1471596

Readding Fab to Server Manager Provisioning Pip provider in puppet doesnot allow install_options, Hence resorting to exec, till we get on to latest puppet Change-Id: I99ac65851731590d4a6b77889697b54c30c93428 Closes-Bug: #1467300 server-manager: service-chaining TCs are failing due to wrong neutron_admin_auth_url Fix: Set the neutron_admin_auth_url to openstack_ip/internal_vip Change-Id: I744b86b210dce331523fe5ba3b0ada5f957dc8a6 Closes-Bug: #1467300 server-manager: service-chaining TCs are failing due to wrong neutron_admin_auth_url Fix: Set the neutron_admin_auth_url to openstack_ip/internal_vip Change-Id: I01eb912f30d3f7abe71d35f7a0b32f1dfcaa2f56
Juniper · Sep 14, 2015 · 048ca2b · 048ca2b
1 parent 53375b9
commit 048ca2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp b/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp
@@ -18,6 +18,15 @@
                    'python-software-properties', 'contrail-fabric-utils', 'contrail-setup' ] :
             ensure => latest
         } ->
+
+        exec { "exec-pip-install-fabric" :
+            command => "pip install /opt/contrail/python_packages/Fabric-1.7.5.tar.gz && echo exec-pip-install-fabric >> /etc/contrail/contrail_common_exec.out",
+            provider => shell,
+            unless => "grep -qx exec-pip-install-fabric /etc/contrail/contrail_common_exec.out",
+            logoutput => $contrail_logoutput
+        }
+        #Untill we upgrade to latest puppet , commenting this out
+        #package {Fabric: ensure => present, provider => pip, install_options => ['--find-links=file://opt/contrail/python_packages']}
         # May need to install fabric-utils here. below commented out code is kept for reference, in case needed.
         # pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 

diff --git a/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp b/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp
@@ -93,8 +93,8 @@
     neutron_region_name    => $::openstack::config::region,
     #neutron_admin_auth_url => "http://${controller_management_address}:35357/v2.0",
     #neutron_url            => "http://${controller_management_address}:9696",
-    neutron_admin_auth_url => "http://${$neutron_ip_address}:35357/v2.0",
-    neutron_url            => "http://${$neutron_ip_address}:9696",
+    neutron_admin_auth_url => "http://${controller_management_address}:35357/v2.0",
+    neutron_url            => "http://${neutron_ip_address}:9696",
     vif_plugging_is_fatal  => false,
     vif_plugging_timeout   => '0',
   }

diff --git a/contrail/environment/modules/openstack/manifests/common/nova.pp b/contrail/environment/modules/openstack/manifests/common/nova.pp
@@ -157,8 +157,7 @@
   class { '::nova::network::neutron':
     neutron_admin_password => $::openstack::config::neutron_password,
     neutron_region_name    => $::openstack::config::region,
-    #neutron_admin_auth_url => "http://${controller_management_address}:35357/v2.0",
-    neutron_admin_auth_url => "http://${contrail_neutron_server}:35357/v2.0",
+    neutron_admin_auth_url => "http://${controller_management_address}:35357/v2.0",
     neutron_url            => "http://${contrail_neutron_server}:9696",
     vif_plugging_is_fatal  => false,
     vif_plugging_timeout   => '0',