From 9a1c906435eecf9454cf9a91b5e4fd09f23f7df1 Mon Sep 17 00:00:00 2001 From: howardlee Date: Wed, 3 Oct 2018 10:08:05 +0800 Subject: [PATCH] Fix bug in deploying ceilometer using dev mode Since the configuration file of the panko module was referenced as a variable during the deployment of the ceilometer module, the project_name variable of the ceilometer module was overwritten, resulting in an error when deploying the ceilometer module using the development mode. This patch will fix this problem. Change-Id: I90d2380b610d3caa988ee667e7c42511d3bbd937 Closes-Bug: #1795770 --- ansible/roles/ceilometer/defaults/main.yml | 2 +- ansible/roles/ceilometer/tasks/clone.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml index cbfc9f0e88..a9da4a2275 100644 --- a/ansible/roles/ceilometer/defaults/main.yml +++ b/ansible/roles/ceilometer/defaults/main.yml @@ -77,7 +77,7 @@ openstack_ceilometer_auth: "{{ openstack_auth }}" #################### # Kolla #################### -ceilometer_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}" +ceilometer_git_repository: "{{ kolla_dev_repos_git }}/ceilometer" ceilometer_dev_repos_pull: "{{ kolla_dev_repos_pull }}" ceilometer_dev_mode: "{{ kolla_dev_mode }}" ceilometer_source_version: "{{ kolla_source_version }}" diff --git a/ansible/roles/ceilometer/tasks/clone.yml b/ansible/roles/ceilometer/tasks/clone.yml index d7515e9345..a811fe49ad 100644 --- a/ansible/roles/ceilometer/tasks/clone.yml +++ b/ansible/roles/ceilometer/tasks/clone.yml @@ -2,6 +2,6 @@ - name: Cloning ceilometer source repository for development git: repo: "{{ ceilometer_git_repository }}" - dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}" + dest: "{{ kolla_dev_repos_directory }}/ceilometer" update: "{{ ceilometer_dev_repos_pull }}" version: "{{ ceilometer_source_version }}"