Merge "Fix bind mount volumes for novajoin containers" into stable/us…

…suri
openstack-archive · Jul 24, 2020 · ec1bdfc · ec1bdfc
2 parents 5456ee0 + 03ab2f2
commit ec1bdfc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml
@@ -196,7 +196,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/novajoin_server.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/novajoin/etc/novajoin/join.conf:/etc/novajoin/join.conf:z
+                  - /var/lib/config-data/puppet-generated/novajoin:/var/lib/kolla/config_files/src:ro
                   - /etc/ipa/:/etc/ipa/:ro
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
                   - /var/log/containers/novajoin:/var/log/novajoin
@@ -214,7 +214,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/novajoin_notifier.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/novajoin/etc/novajoin/join.conf:/etc/novajoin/join.conf:z
+                  - /var/lib/config-data/puppet-generated/novajoin:/var/lib/kolla/config_files/src:ro
                   - /etc/ipa/:/etc/ipa/:ro
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
                   - /var/log/containers/novajoin:/var/log/novajoin