diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/ceilometer-agent-compute.yaml | 17 | ||||
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 4 | ||||
| -rw-r--r-- | docker/services/logrotate-crond.yaml | 2 | ||||
| -rw-r--r-- | docker/services/zaqar.yaml | 2 |
4 files changed, 20 insertions, 5 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/docker/services/logrotate-crond.yaml b/docker/services/logrotate-crond.yaml index f49fd36b..22ee5b56 100644 --- a/docker/services/logrotate-crond.yaml +++ b/docker/services/logrotate-crond.yaml @@ -78,7 +78,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/logrotate-crond.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/logrotate-crond/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/crond/:/var/lib/kolla/config_files/src:ro - /var/log/containers:/var/log/containers environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 072c6759..b6fb4001 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -57,7 +57,7 @@ resources: type: ../../puppet/services/database/mysql-client.yaml ZaqarBase: - type: ../../puppet/services/zaqar.yaml + type: ../../puppet/services/zaqar-api.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} |