diff options
| -rw-r--r-- | docker/services/ceilometer-agent-compute.yaml | 17 | ||||
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/nova-libvirt.yaml | 2 |
3 files changed, 20 insertions, 3 deletions
diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index 09677c64..535b1693 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -92,6 +92,21 @@ outputs: environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS upgrade_tasks: - - name: Stop and disable ceilometer-agent-compute service + - name: Check if openstack-ceilometer-compute is deployed + command: systemctl is-enabled openstack-ceilometer-compute + tags: step2 + ignore_errors: True + register: openstack_ceilometer_compute_enabled + - name: Check if openstack-ceilometer-polling is deployed + command: systemctl is-enabled openstack-ceilometer-polling + tags: step2 + ignore_errors: True + register: openstack_ceilometer_polling_enabled + - name: Stop and disable ceilometer compute agent tags: step2 service: name=openstack-ceilometer-compute state=stopped enabled=no + when: openstack_ceilometer_compute_enabled.rc == 0 + - name: Stop and disable ceilometer polling agent + tags: step2 + service: name=openstack-ceilometer-polling state=stopped enabled=no + when: openstack_ceilometer_polling_enabled.rc == 0 diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index f09e98ce..d78ff7fd 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -138,14 +138,14 @@ resources: if: - custom_registry_host - yaql: - expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[1] + expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[1] data: {get_param: DockerCephDaemonImage} - docker.io image: if: - custom_registry_host - yaql: - expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[2] + expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[2] data: {get_param: DockerCephDaemonImage} - yaql: expression: $.data.rightSplit(':', 1)[0] diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index df9e88fb..3f37cd94 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -170,6 +170,8 @@ outputs: - generate_service_certificates: true tripleo::profile::base::nova::migration::client::libvirt_tls: true + nova::migration::libvirt::listen_address: + get_param: [ServiceNetMap, NovaLibvirtNetwork] nova::migration::libvirt::live_migration_inbound_addr: str_replace: template: |