Skip to content

Commit 145e64d

Browse files
committed
Move project_name and kolla_role_name to role vars
Role vars have a higher precedence than role defaults. This allows to import default vars from another role via vars_files without overriding project_name (see closed bug for details). Compared to wallaby, this cherry picked change includes the karbor, qinling and searchlight roles. Change-Id: I3d919736e53d6f3e1a70d1267cf42c8d2c0ad221 Closes-Bug: #1951785 (cherry picked from commit 56fc74f) (cherry picked from commit 6c69556) (cherry picked from commit 6cb0e10)
1 parent a3dcaea commit 145e64d

File tree

140 files changed

+144
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+144
-142
lines changed

ansible/roles/aodh/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
project_name: "aodh"
3-
42
aodh_services:
53
aodh-api:
64
container_name: aodh_api

ansible/roles/aodh/vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
project_name: "aodh"

ansible/roles/barbican/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
project_name: "barbican"
3-
42
barbican_services:
53
barbican-api:
64
container_name: barbican_api
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
project_name: "barbican"

ansible/roles/bifrost/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
project_name: "bifrost"
3-
42
####################
53
# Docker
64
####################
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
project_name: "bifrost"

ansible/roles/blazar/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
project_name: "blazar"
3-
42
blazar_services:
53
blazar-api:
64
container_name: blazar_api

ansible/roles/blazar/vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
project_name: "blazar"

ansible/roles/ceilometer/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
project_name: "ceilometer"
3-
42
ceilometer_services:
53
ceilometer-notification:
64
container_name: ceilometer_notification
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
project_name: "ceilometer"

0 commit comments

Comments
 (0)