From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 22 Mar 2017 03:55:50 +0000 (+0000)
Subject: Merge "Enables OpenDaylight clustering in HA deployments"
X-Git-Tag: opnfv-6.0.0~886
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b758dff5758a84b8a72766dd2591477f68b23c50;p=apex-tripleo-heat-templates.git

Merge "Enables OpenDaylight clustering in HA deployments"
---

b758dff5758a84b8a72766dd2591477f68b23c50
diff --cc puppet/services/opendaylight-api.yaml
index e55cd2ee,06bb84a8..6882aeff
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@@ -66,28 -61,6 +66,29 @@@ outputs
                    - {get_param: OpenDaylightPort}
                    - 6640
                    - 6653
+                   - 2550
        step_config: |
          include tripleo::profile::base::neutron::opendaylight
 +      upgrade_tasks:
 +        - name: Check if opendaylight is deployed
 +          command: systemctl is-enabled opendaylight
 +          tags: common
 +          ignore_errors: True
 +          register: opendaylight_enabled
 +        - name: "PreUpgrade step0,validation: Check service opendaylight is running"
 +          shell: /usr/bin/systemctl show 'opendaylight' --property ActiveState | grep '\bactive\b'
 +          when: opendaylight_enabled.rc == 0
 +          tags: step0,validation
 +        - name: Stop opendaylight service
 +          tags: step1
 +          when: opendaylight_enabled.rc == 0
 +          service: name=opendaylight state=stopped
 +        - name: Removes ODL snapshots, data, journal directories
 +          file:
 +            state: absent
 +            path: /opt/opendaylight/{{item}}
 +          tags: step2
 +          with_items:
 +            - snapshots
 +            - data
 +            - journal