Merge pull request #96 from noelmcloughlin/service

fix(upstream): use specificed name for the upstream

Author: noelmcloughlin

pillar.example

@@ -95,11 +95,9 @@ rabbitmq:
               - '.*'
       policies:
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
@@ -199,11 +197,9 @@ rabbitmq:
               - '.*'
       policies:
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1

rabbitmq/config/policies/install.sls

@@ -14,6 +14,7 @@ include:
 
 rabbitmq-config-policies-enabled-{{ name }}-{{ policy }}:
   rabbitmq_policy.present:
+    - name: {{ policy }}
                 {%- for v in p %}
     - {{ v|yaml }}
                 {%- endfor %}

rabbitmq/config/upstreams/install.sls

@@ -14,6 +14,7 @@ include:
 
 rabbitmq-config-upstreams-enabled-{{ name }}-{{ upstream }}:
   rabbitmq_upstream.present:
+    - name: {{ upstream }}
                 {%- for v in p %}
     - {{ v|yaml }}
                 {%- endfor %}

test/integration/default/files/_mapdata/centos-7.yaml

@@ -69,12 +69,10 @@ values:
       - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -164,12 +162,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/centos-8.yaml

@@ -69,12 +69,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -164,12 +162,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/debian-10.yaml

@@ -67,12 +67,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -162,12 +160,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/debian-11.yaml

@@ -65,12 +65,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -160,12 +158,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/debian-9.yaml

@@ -67,12 +67,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -161,12 +159,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/fedora-32.yaml

@@ -69,12 +69,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -164,12 +162,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:

test/integration/default/files/_mapdata/fedora-33.yaml

@@ -69,12 +69,10 @@ values:
         - rabbitmq_shovel_management
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues:
@@ -164,12 +162,10 @@ values:
       plugins: []
       policies:
         my-federate-policy:
-          - name: federate-me
           - pattern: '^federated\.'
           - definition: '{"federation-upstream-set":"all"}'
           - priority: 1
         my-ha-policy:
-          - name: HA
           - pattern: '.*'
           - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}'
       queues: