Merge "Fixes ODL container failing to start due to missing etc config" into stable/queens
This commit is contained in:
commit
ca669346c9
@ -138,7 +138,6 @@ outputs:
|
|||||||
- /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
|
- /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/lib/opendaylight/journal:/opt/opendaylight/journal
|
- /var/lib/opendaylight/journal:/opt/opendaylight/journal
|
||||||
- /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
|
- /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
|
||||||
- /var/lib/opendaylight/etc:/opt/opendaylight/etc
|
|
||||||
environment:
|
environment:
|
||||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
@ -155,7 +154,7 @@ outputs:
|
|||||||
copy:
|
copy:
|
||||||
dest: /var/log/opendaylight/readme.txt
|
dest: /var/log/opendaylight/readme.txt
|
||||||
content: |
|
content: |
|
||||||
Logs from opendaylight container can be found by running "docker logs opendaylight_api"
|
Logs from opendaylight container can be found by running "sudo docker logs opendaylight_api"
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
- name: Check if opendaylight is deployed
|
- name: Check if opendaylight is deployed
|
||||||
@ -174,7 +173,7 @@ outputs:
|
|||||||
- step|int == 2
|
- step|int == 2
|
||||||
- opendaylight_enabled.rc == 0
|
- opendaylight_enabled.rc == 0
|
||||||
service: name=opendaylight state=stopped enabled=no
|
service: name=opendaylight state=stopped enabled=no
|
||||||
# Containarised deployment upgrade steps
|
# Containerized deployment upgrade steps
|
||||||
- name: ODL container L2 update and upgrade tasks
|
- name: ODL container L2 update and upgrade tasks
|
||||||
block: &odl_container_upgrade_tasks
|
block: &odl_container_upgrade_tasks
|
||||||
- name: remove journal and snapshots
|
- name: remove journal and snapshots
|
||||||
@ -187,14 +186,17 @@ outputs:
|
|||||||
- journal
|
- journal
|
||||||
- name: Set ODL upgrade flag to True
|
- name: Set ODL upgrade flag to True
|
||||||
copy:
|
copy:
|
||||||
dest: /var/lib/opendaylight/etc/opendaylight/datastore/initial/config/genius-mdsalutil-config.xml
|
dest: /var/lib/config-data/puppet-generated/opendaylight/etc/opendaylight/datastore/initial/config/genius-mdsalutil-config.xml
|
||||||
content: |
|
content: |
|
||||||
<config xmlns="urn:opendaylight:params:xml:ns:yang:mdsalutil">
|
<config xmlns="urn:opendaylight:params:xml:ns:yang:mdsalutil">
|
||||||
<upgradeInProgress>true</upgradeInProgress>
|
<upgradeInProgress>true</upgradeInProgress>
|
||||||
</config>
|
</config>
|
||||||
|
owner: odl
|
||||||
|
group: odl
|
||||||
|
mode: 0644
|
||||||
when: step|int == 1
|
when: step|int == 1
|
||||||
post_upgrade_tasks: &odl_container_post_upgrade_tasks
|
post_upgrade_tasks: &odl_container_post_upgrade_tasks
|
||||||
- name: Unset upgrade flag in ODL
|
- name: Disable Upgrade Flag via Rest
|
||||||
shell:
|
shell:
|
||||||
str_replace:
|
str_replace:
|
||||||
template: 'curl -k -v --silent --fail -u ODL_USERNAME:$ODL_PASSWORD -X \
|
template: 'curl -k -v --silent --fail -u ODL_USERNAME:$ODL_PASSWORD -X \
|
||||||
@ -206,6 +208,17 @@ outputs:
|
|||||||
$ODL_PASSWORD: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::password']}
|
$ODL_PASSWORD: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::password']}
|
||||||
$ODL_URI: {get_param: [EndpointMap, OpenDaylightInternal, uri]}
|
$ODL_URI: {get_param: [EndpointMap, OpenDaylightInternal, uri]}
|
||||||
when: step|int == 0
|
when: step|int == 0
|
||||||
|
- name: Disable Upgrade in Config File
|
||||||
|
copy:
|
||||||
|
dest: /var/lib/config-data/puppet-generated/opendaylight/etc/opendaylight/datastore/initial/config/genius-mdsalutil-config.xml
|
||||||
|
content: |
|
||||||
|
<config xmlns="urn:opendaylight:params:xml:ns:yang:mdsalutil">
|
||||||
|
<upgradeInProgress>false</upgradeInProgress>
|
||||||
|
</config>
|
||||||
|
owner: odl
|
||||||
|
group: odl
|
||||||
|
mode: 0644
|
||||||
|
when: step|int == 0
|
||||||
update_tasks:
|
update_tasks:
|
||||||
- name: Get ODL update level
|
- name: Get ODL update level
|
||||||
block: &get_odl_update_level
|
block: &get_odl_update_level
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes OpenDaylight container service not starting due to missing config
|
||||||
|
files in /opt/opendaylight/etc directory.
|
Loading…
Reference in New Issue
Block a user