diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-01 07:55:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-01 07:55:16 +0000 |
| commit | 33a93bbf0999feafcce4046eb90bdd1917c5e4ea (patch) | |
| tree | c9880d3a5a814b068bc8940e38db7db8196b6018 /docker/services | |
| parent | 111861fae8981246e9e75fd52162bc0502b6ed19 (diff) | |
| parent | 2b07da8aaaf27f6ce9fb33acd597a19522e29b67 (diff) | |
Merge "Remove puppet run and workarounds from tripleo_upgrade_node.sh" into stable/pike
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/nova-compute.yaml | 11 | ||||
| -rw-r--r-- | docker/services/nova-conductor.yaml | 12 |
2 files changed, 22 insertions, 1 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 39d1740c..bf7841be 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -41,6 +41,10 @@ parameters: description: Port that dockerized nova migration target sshd service binds to. type: number + UpgradeLevelNovaCompute: + type: string + description: Nova Compute upgrade level + default: '' resources: @@ -142,6 +146,13 @@ outputs: path: /etc/ceph state: directory upgrade_tasks: + - name: Set compute upgrade level to auto + tags: step1 + ini_file: + str_replace: + template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL" + params: + LEVEL: {get_param: UpgradeLevelNovaCompute} - name: Stop and disable nova-compute service tags: step2 service: name=openstack-nova-compute state=stopped enabled=no diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index ae737056..17d137cc 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -36,7 +36,10 @@ parameters: default: {} description: Parameters specific to the role type: json - + UpgradeLevelNovaCompute: + type: string + description: Nova Compute upgrade level + default: '' resources: @@ -108,6 +111,13 @@ outputs: path: /var/log/containers/nova state: directory upgrade_tasks: + - name: Set compute upgrade level to auto + tags: step1 + ini_file: + str_replace: + template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL" + params: + LEVEL: {get_param: UpgradeLevelNovaCompute} - name: Stop and disable nova_conductor service tags: step2 service: name=openstack-nova-conductor state=stopped enabled=no |