Merge lp:~niedbalski/charms/trusty/nova-cloud-controller/fix-1350085 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Jorge Niedbalski]

- Fix for LP:#1350085 if the node is clustered, then use the vip address for db relation.

[James Page (james-page)]

Please see my comments on bug 1350085. I don't think that using the VIP as the source for access is correct - its only ever owned by a single node, so other nodes would not be able to access in this case and the nova-cloud-controller is a scale out charm.

There are a few merge conflicts as well

review: Disapprove

Unmerged revisions

79. By Jorge Niedbalski on 2014-07-29

- Fix for 1350085 , if node is clustered, then use vip, ifnot use ip-address

78. By James Page on 2014-06-17

[james-page,r=gnuoy] Cherry pick fixes for NSX on icehouse

=== modified file 'config.yaml'
--- config.yaml	2014-07-29 11:50:07 +0000
+++ config.yaml	2014-07-29 23:00:54 +0000
@@ -159,6 +159,7 @@
   nvp-l3-uuid:
     type: string
     description: |
+<<<<<<< TREE
       This is uuid of the default NVP/NSX L3 Gateway Service.
   # end of NVP/NSX configuration
   # Network configuration options
@@ -203,3 +204,7 @@
         * shared-db or (pgsql-nova-db, pgsql-neutron-db)
         * amqp
         * identity-service
+=======
+      This is uuid of the default NVP/NSX L3 Gateway Service.
+  # end of NVP/NSX configuration
+>>>>>>> MERGE-SOURCE
 
=== modified file 'hooks/nova_cc_context.py'
=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-07-29 12:25:27 +0000
+++ hooks/nova_cc_hooks.py	2014-07-29 23:00:54 +0000
@@ -44,10 +44,14 @@
     neutron_plugin_attribute,
 )
 
+<<<<<<< TREE
 from nova_cc_context import (
     NeutronAPIContext
 )
 
+=======
+
+>>>>>>> MERGE-SOURCE
 from nova_cc_utils import (
     api_port,
     auth_token_config,
@@ -79,6 +83,7 @@
     eligible_leader,
     get_hacluster_config,
     is_leader,
+    is_clustered
 )
 
 from charmhelpers.payload.execd import execd_preinstall
@@ -161,14 +166,20 @@
         log(e, level=ERROR)
         raise Exception(e)
 
+    if is_clustered():
+        addr = config('vip')
+    else:
+        addr = unit_get('private-address')
+
     relation_set(nova_database=config('database'),
                  nova_username=config('database-user'),
-                 nova_hostname=unit_get('private-address'))
+                 nova_hostname=addr)
+
     if network_manager() in ['quantum', 'neutron']:
         # XXX: Renaming relations from quantum_* to neutron_* here.
         relation_set(neutron_database=config('neutron-database'),
                      neutron_username=config('neutron-database-user'),
-                     neutron_hostname=unit_get('private-address'))
+                     neutron_hostname=addr)
 
 
 @hooks.hook('pgsql-nova-db-relation-joined')