Merge lp:~hopem/charms/trusty/cinder/add-backup-support into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11152 cinder-next for hopem mp261243
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11152/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6933 cinder-next for hopem mp261243
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6933/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7028 cinder-next for hopem mp261243
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12644797/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7028/

[Liam Young (gnuoy)]

Approve

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11533 cinder-next for hopem mp261243
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11533/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10727 cinder-next for hopem mp261243
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10727/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7240 cinder-next for hopem mp261243
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7240/

=== added symlink 'hooks/backup-backend-relation-broken'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/backup-backend-relation-changed'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/backup-backend-relation-departed'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/backup-backend-relation-joined'
=== target is u'cinder_hooks.py'
=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-09-29 15:30:32 +0000
+++ hooks/cinder_hooks.py	2015-10-01 13:39:08 +0000
@@ -163,6 +163,10 @@
             for rid in relation_ids('storage-backend'):
                 relation_set(relation_id=rid,
                              upgrade_nonce=uuid.uuid4())
+            # NOTE(hopem) tell any backup-backends we just upgraded
+            for rid in relation_ids('backup-backend'):
+                relation_set(relation_id=rid,
+                             upgrade_nonce=uuid.uuid4())
 
     # overwrite config is not in conf file. so We can't use restart_on_change
     if config_value_changed('overwrite'):
@@ -561,6 +565,13 @@
     CONFIGS.write(CINDER_CONF)
 
 
[e-mail]('backup-backend-relation-changed')
[e-mail]('backup-backend-relation-broken')
+@restart_on_change(restart_map())
+def backup_backend():
+    CONFIGS.write(CINDER_CONF)
+
+
 @hooks.hook('nrpe-external-master-relation-joined',
             'nrpe-external-master-relation-changed')
 def update_nrpe_config():
 
=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2015-09-29 15:52:10 +0000
+++ hooks/cinder_utils.py	2015-10-01 13:39:08 +0000
@@ -185,7 +185,7 @@
                           cinder_contexts.HAProxyContext(),
                           cinder_contexts.ImageServiceContext(),
                           cinder_contexts.CinderSubordinateConfigContext(
-                              interface='storage-backend',
+                              interface=['storage-backend', 'backup-backend'],
                               service='cinder',
                               config_file=CINDER_CONF),
                           cinder_contexts.StorageBackendContext(),
@@ -195,7 +195,7 @@
                               service_user='cinder'),
                           context.BindHostContext(),
                           context.WorkerConfigContext()],
-        'services': ['cinder-api', 'cinder-volume',
+        'services': ['cinder-api', 'cinder-volume', 'cinder-backup',
                      'cinder-scheduler', 'haproxy']
     }),
     (CINDER_API_CONF, {
@@ -204,7 +204,7 @@
     }),
     (ceph_config_file(), {
         'hook_contexts': [context.CephContext()],
-        'services': ['cinder-volume']
+        'services': ['cinder-volume', 'cinder-backup']
     }),
     (HAPROXY_CONF, {
         'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-01 14:47:56 +0000
+++ metadata.yaml	2015-10-01 13:39:08 +0000
@@ -32,6 +32,9 @@
   storage-backend:
     interface: cinder-backend
     scope: container
+  backup-backend:
+    interface: cinder-backup
+    scope: container
 peers:
   cluster:
     interface: cinder-ha
 
=== modified file 'templates/parts/backends'
--- templates/parts/backends	2014-04-02 07:58:11 +0000
+++ templates/parts/backends	2015-10-01 13:39:08 +0000
@@ -1,18 +1,18 @@
 {% if sections and 'DEFAULT' in sections -%}
 {% for key, value in sections['DEFAULT'] -%}
 {{ key }} = {{ value }}
-{% endfor -%}
-{% endif -%}
+{% endfor %}
+{%- endif %}
 
 {% if backends -%}
 enabled_backends = {{ backends }}
-{% endif -%}
+{%- endif %}
 
 {% for section in sections -%}
 {% if section != 'DEFAULT' -%}
 [{{ section }}]
 {% for key, value in sections[section] -%}
 {{ key }} = {{ value }}
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
 \ No newline at end of file
+{% endfor %}
+{% endif %}
+{%- endfor %}
 \ No newline at end of file
 
=== modified file 'unit_tests/test_cinder_utils.py'
--- unit_tests/test_cinder_utils.py	2015-08-03 09:22:32 +0000
+++ unit_tests/test_cinder_utils.py	2015-10-01 13:39:08 +0000
@@ -151,16 +151,18 @@
 
     def test_services(self):
         self.assertEquals(cinder_utils.services(),
-                          ['haproxy', 'apache2', 'cinder-api',
-                           'cinder-volume', 'cinder-scheduler'])
+                          ['haproxy', 'cinder-backup', 'cinder-api',
+                           'cinder-volume', 'apache2', 'cinder-scheduler'])
 
     def test_creates_restart_map_all_enabled(self):
         'It creates correct restart map when all services enabled'
         ex_map = OrderedDict([
             ('/etc/cinder/cinder.conf', ['cinder-api', 'cinder-volume',
-                                         'cinder-scheduler', 'haproxy']),
+                                         'cinder-backup', 'cinder-scheduler',
+                                         'haproxy']),
             ('/etc/cinder/api-paste.ini', ['cinder-api']),
-            ('/var/lib/charm/cinder/ceph.conf', ['cinder-volume']),
+            ('/var/lib/charm/cinder/ceph.conf', ['cinder-volume',
+                                                 'cinder-backup']),
             ('/etc/haproxy/haproxy.cfg', ['haproxy']),
             ('/etc/apache2/sites-available/openstack_https_frontend',
              ['apache2']),
@@ -723,8 +725,8 @@
         ]
         self.assertEquals(render.call_args_list, expected)
         expected = [
-            call('tgtd'), call('haproxy'), call('apache2'),
-            call('cinder-api'), call('cinder-volume'),
+            call('tgtd'), call('haproxy'), call('cinder-backup'),
+            call('cinder-api'), call('cinder-volume'), call('apache2'),
             call('cinder-scheduler'),
         ]
         self.assertEquals(service_restart.call_args_list, expected)