aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-08-22 12:06:30 +0000
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-08-22 15:36:25 +0300
commit8cb4da7a1ed969bf8f44ebe39f5153141d5a3c5c (patch)
treeda9195c5eae9a10f07d4e377d61a1ed8e512bdcf
parent1d1ad7849b65e5ecbaf3e0f260b4ad1827dc6f22 (diff)
Zaqar: Match service name with service-net-map
This is required for t-h-t to generate the appropriate hieradata. Change-Id: I9b451eac4427a52ad8eec62ff89acc6c6d3ab799 Closes-Bug: #1712328
-rw-r--r--ci/environments/scenario002-multinode-containers.yaml2
-rw-r--r--ci/environments/scenario002-multinode.yaml2
-rw-r--r--docker/services/zaqar.yaml2
-rw-r--r--environments/services/zaqar.yaml2
-rw-r--r--puppet/services/zaqar-api.yaml (renamed from puppet/services/zaqar.yaml)4
-rw-r--r--releasenotes/notes/Change-zaqar-profile-path-7b00c68c0812fb3d.yaml6
6 files changed, 12 insertions, 6 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index fe06ef66..584c1e5e 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -11,7 +11,7 @@ resource_registry:
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
# TODO: Zaqar doesn't work when containerized
# https://bugs.launchpad.net/tripleo/+bug/1710959
- OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
+ OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
# NOTE: This is needed because of upgrades from Ocata to Pike. We
# deploy the initial environment with Ocata templates, and
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml
index 513d3f71..5670c213 100644
--- a/ci/environments/scenario002-multinode.yaml
+++ b/ci/environments/scenario002-multinode.yaml
@@ -2,7 +2,7 @@ resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
- OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
+ OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml
OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml
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}
diff --git a/environments/services/zaqar.yaml b/environments/services/zaqar.yaml
index e501b69c..f57582c2 100644
--- a/environments/services/zaqar.yaml
+++ b/environments/services/zaqar.yaml
@@ -1,3 +1,3 @@
resource_registry:
- OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
+ OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml
diff --git a/puppet/services/zaqar.yaml b/puppet/services/zaqar-api.yaml
index 4a1ad179..82d105ef 100644
--- a/puppet/services/zaqar.yaml
+++ b/puppet/services/zaqar-api.yaml
@@ -87,9 +87,9 @@ resources:
outputs:
role_data:
- description: Shared role data for the Heat services.
+ description: Shared role data for the Zaqar services.
value:
- service_name: zaqar
+ service_name: zaqar_api
config_settings:
map_merge:
- get_attr: [ApacheServiceBase, role_data, config_settings]
diff --git a/releasenotes/notes/Change-zaqar-profile-path-7b00c68c0812fb3d.yaml b/releasenotes/notes/Change-zaqar-profile-path-7b00c68c0812fb3d.yaml
new file mode 100644
index 00000000..52db34b6
--- /dev/null
+++ b/releasenotes/notes/Change-zaqar-profile-path-7b00c68c0812fb3d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The path to the zaqar profile has changed from puppet/services/zaqar.yaml to
+ puppet/services/zaqar-api.yaml. Make sure to update any references to this
+ in the resource registry.