Merge branch 'master' into ingress-address

charmhelpers/contrib/openstack/amulet/deployment.py

@@ -303,22 +303,29 @@ def get_ceph_expected_pools(self, radosgw=False):
         test scenario, based on OpenStack release and whether ceph radosgw
         is flagged as present or not."""
 
-        if self._get_openstack_release() >= self.trusty_kilo:
-            # Kilo or later
+        if self._get_openstack_release() <= self.trusty_juno:
+            # Juno or earlier
             pools = [
+                'data',
+                'metadata',
                 'rbd',
                 'cinder-ceph',
                 'glance'
             ]
-        else:
-            # Juno or earlier
+        elif (self.trust_kilo <= self._get_openstack_release() <=
+              self.zesty_ocata):
+            # Kilo through Ocata
             pools = [
-                'data',
-                'metadata',
                 'rbd',
                 'cinder-ceph',
                 'glance'
             ]
+        else:
+            # Pike and later
+            pools = [
+                'cinder-ceph',
+                'glance'
+            ]
 
         if radosgw:
             pools.extend([

charmhelpers/contrib/openstack/context.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import collections
 import glob
 import json
 import math
@@ -578,11 +579,14 @@ def __call__(self):
             laddr = get_address_in_network(config(cfg_opt))
             if laddr:
                 netmask = get_netmask_for_address(laddr)
-                cluster_hosts[laddr] = {'network': "{}/{}".format(laddr,
-                                                                  netmask),
-                                        'backends': {l_unit: laddr}}
+                cluster_hosts[laddr] = {
+                    'network': "{}/{}".format(laddr,
+                                              netmask),
+                    'backends': collections.OrderedDict([(l_unit,
+                                                          laddr)])
+                }
                 for rid in relation_ids('cluster'):
-                    for unit in related_units(rid):
+                    for unit in sorted(related_units(rid)):
                         _laddr = relation_get('{}-address'.format(addr_type),
                                               rid=rid, unit=unit)
                         if _laddr:
@@ -594,10 +598,13 @@ def __call__(self):
         # match in the frontend
         cluster_hosts[addr] = {}
         netmask = get_netmask_for_address(addr)
-        cluster_hosts[addr] = {'network': "{}/{}".format(addr, netmask),
-                               'backends': {l_unit: addr}}
+        cluster_hosts[addr] = {
+            'network': "{}/{}".format(addr, netmask),
+            'backends': collections.OrderedDict([(l_unit,
+                                                  addr)])
+        }
         for rid in relation_ids('cluster'):
-            for unit in related_units(rid):
+            for unit in sorted(related_units(rid)):
                 _laddr = relation_get('private-address',
                                       rid=rid, unit=unit)
                 if _laddr:

charmhelpers/contrib/openstack/templating.py

@@ -272,6 +272,8 @@ def write(self, config_file):
             raise OSConfigException
 
         _out = self.render(config_file)
+        if six.PY3:
+            _out = _out.encode('UTF-8')
 
         with open(config_file, 'wb') as out:
             out.write(_out)

charmhelpers/contrib/openstack/utils.py

@@ -797,7 +797,7 @@ def git_default_repos(projects_yaml):
     service = service_name()
     core_project = service
 
-    for default, branch in GIT_DEFAULT_BRANCHES.iteritems():
+    for default, branch in six.iteritems(GIT_DEFAULT_BRANCHES):
         if projects_yaml == default:
 
             # add the requirements repo first

tests/contrib/openstack/test_os_contexts.py

@@ -1,3 +1,4 @@
+import collections
 import charmhelpers.contrib.openstack.context as context
 import yaml
 import json
@@ -1769,35 +1770,35 @@ def test_haproxy_context_with_data_multinet(self, local_unit, unit_get):
             'frontends': {
                 'cluster-peer0.admin': {
                     'network': 'cluster-peer0.admin/255.255.0.0',
-                    'backends': {
-                        'peer-0': 'cluster-peer0.admin',
-                        'peer-1': 'cluster-peer1.admin',
-                        'peer-2': 'cluster-peer2.admin',
-                    }
+                    'backends': collections.OrderedDict([
+                        ('peer-0', 'cluster-peer0.admin'),
+                        ('peer-1', 'cluster-peer1.admin'),
+                        ('peer-2', 'cluster-peer2.admin'),
+                    ]),
                 },
                 'cluster-peer0.internal': {
                     'network': 'cluster-peer0.internal/255.255.0.0',
-                    'backends': {
-                        'peer-0': 'cluster-peer0.internal',
-                        'peer-1': 'cluster-peer1.internal',
-                        'peer-2': 'cluster-peer2.internal',
-                    }
+                    'backends': collections.OrderedDict([
+                        ('peer-0', 'cluster-peer0.internal'),
+                        ('peer-1', 'cluster-peer1.internal'),
+                        ('peer-2', 'cluster-peer2.internal'),
+                    ]),
                 },
                 'cluster-peer0.public': {
                     'network': 'cluster-peer0.public/255.255.0.0',
-                    'backends': {
-                        'peer-0': 'cluster-peer0.public',
-                        'peer-1': 'cluster-peer1.public',
-                        'peer-2': 'cluster-peer2.public',
-                    }
+                    'backends': collections.OrderedDict([
+                        ('peer-0', 'cluster-peer0.public'),
+                        ('peer-1', 'cluster-peer1.public'),
+                        ('peer-2', 'cluster-peer2.public'),
+                    ]),
                 },
                 'cluster-peer0.localnet': {
                     'network': 'cluster-peer0.localnet/255.255.0.0',
-                    'backends': {
-                        'peer-0': 'cluster-peer0.localnet',
-                        'peer-1': 'cluster-peer1.localnet',
-                        'peer-2': 'cluster-peer2.localnet',
-                    }
+                    'backends': collections.OrderedDict([
+                        ('peer-0', 'cluster-peer0.localnet'),
+                        ('peer-1', 'cluster-peer1.localnet'),
+                        ('peer-2', 'cluster-peer2.localnet'),
+                    ]),
                 }
             },
             'default_backend': 'cluster-peer0.localnet',