diff --git a/example.sh b/example.sh index d9ab30a5..3f21bce2 100755 --- a/example.sh +++ b/example.sh @@ -19,6 +19,7 @@ solar assign -n 'node/node_2 | node/node_1' -r 'resources/docker' solar assign -n 'node/node_1' -r 'resources/mariadb' solar assign -n 'node/node_1' -r 'resources/keystone' solar assign -n 'node/node_1' -r 'resources/haproxy' +solar assign -n 'node/node_1' -r 'resources/rabbitmq' solar connect --profile prf1 diff --git a/resources/rabbitmq_config/meta.yaml b/resources/rabbitmq_config/meta.yaml index f6f8c8d7..fbc95887 100644 --- a/resources/rabbitmq_config/meta.yaml +++ b/resources/rabbitmq_config/meta.yaml @@ -20,3 +20,5 @@ input: ssh_user: schema: str! value: + +tags: [resources/rabbitmq, resource/rabbitmq_config] diff --git a/resources/rabbitmq_service/meta.yaml b/resources/rabbitmq_service/meta.yaml index 50dc2349..c97dd845 100644 --- a/resources/rabbitmq_service/meta.yaml +++ b/resources/rabbitmq_service/meta.yaml @@ -7,13 +7,13 @@ input: value: rabbitmq:3-management container_name: schema: str! - value: + value: rabbitmq_service management_port: schema: str! - value: + value: 15672 port: schema: str! - value: + value: 5672 ip: schema: str! value: @@ -23,3 +23,5 @@ input: ssh_user: schema: str! value: + +tags: [resources/rabbitmq, resource/rabbitmq_service] diff --git a/resources/rabbitmq_user/meta.yaml b/resources/rabbitmq_user/meta.yaml index 7a6b659f..70a6f882 100644 --- a/resources/rabbitmq_user/meta.yaml +++ b/resources/rabbitmq_user/meta.yaml @@ -1,4 +1,4 @@ -id: keystone_user +id: rabbitmq_user handler: ansible version: 1.0.0 input: @@ -7,10 +7,10 @@ input: value: user_name: schema: str! - value: + value: openstack password: schema: str! - value: + value: openstack_password vhost_name: schema: str! value: @@ -23,3 +23,5 @@ input: ssh_user: schema: str! value: + +tags: [resources/rabbitmq, resource/rabbitmq_user] diff --git a/resources/rabbitmq_vhost/meta.yaml b/resources/rabbitmq_vhost/meta.yaml index f8ecf4f3..c1a5689a 100644 --- a/resources/rabbitmq_vhost/meta.yaml +++ b/resources/rabbitmq_vhost/meta.yaml @@ -7,7 +7,7 @@ input: value: vhost_name: schema: str! - value: + value: openstack ip: schema: str! value: @@ -18,4 +18,4 @@ input: schema: str! value: -tags: [resource/rabbitmq] +tags: [resources/rabbitmq, resource/rabbitmq_vhost] diff --git a/templates/profile.yml b/templates/profile.yml index ce6605c9..7d084ae0 100644 --- a/templates/profile.yml +++ b/templates/profile.yml @@ -96,3 +96,17 @@ connections: filter_resources: [resource/keystone_service_endpoint] mapping: admin_port: keystone_port + + # rabbitmq + - for_resources: [resource/keystone_service] + filter_resources: [resource/keystone_vhost] + mapping: {} + + - for_resources: [resource/keystone_service] + filter_resources: [resource/keystone_user] + mapping: {} + + - for_resources: [resource/keystone_vhost] + filter_resources: [resource/keystone_user] + mapping: + vhost_name: vhost_name