Bump further the stop/start timeout for pcmk/systemd services

[apex-tripleo-heat-templates.git] / deprecated / overcloud-source.yaml

diff --git a/deprecated/overcloud-source.yaml b/deprecated/overcloud-source.yaml
index 91b6b7f..0729b33 100644 (file)
--- a/deprecated/overcloud-source.yaml
+++ b/deprecated/overcloud-source.yaml
@@ -221,7 +221,7 @@ parameters:
       If set, flat networks to configure in neutron plugins. Defaults to
       'datacentre' to permit external network creation.
   NeutronNetworkType:
-    default: 'gre'
+    default: 'vxlan'
     description: The tenant network type for Neutron, either gre or vxlan.
     type: string
   NeutronNetworkVLANRanges:
@@ -279,7 +279,7 @@ parameters:
     description: Shared secret to prevent spoofing
     type: string
   NeutronTunnelTypes:
-    default: 'gre'
+    default: 'vxlan'
     description: |
         The tunnel types for the Neutron tenant network. To specify multiple
         values, use a comma separated string, like so: 'gre,vxlan'
@@ -475,6 +475,8 @@ resources:
     SubKey: resources.NovaCompute0PassthroughSpecific
     parameters:
         passthrough_config_specific: {get_param: NovaComputeExtraConfig}
+  HeatAuthEncryptionKey:
+    type: OS::Heat::RandomString
   controllerConfig:
     type: OS::Heat::StructuredConfig
     properties:
@@ -561,7 +563,8 @@ resources:
             get_param: HeatPassword
           admin_tenant_name: service
           admin_user: heat
-          auth_encryption_key: unset___________
+          auth_encryption_key:
+            get_resource: HeatAuthEncryptionKey
           db:
             Fn::Join:
               - ''
@@ -874,10 +877,6 @@ resources:
                     - ' '
                     - - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
                       - {get_attr: [NovaCompute0, name]}
-                      - Fn::Join:
-                        - '.'
-                        - - {get_attr: [NovaCompute0, name]}
-                          - 'novalocal'
             - Fn::Join:
               - "\n"
               - Merge::Map:
@@ -886,10 +885,6 @@ resources:
                     - ' '
                     - - {get_attr: [BlockStorage0, networks, ctlplane, 0]}
                       - {get_attr: [BlockStorage0, name]}
-                      - Fn::Join:
-                        - '.'
-                        - - {get_attr: [BlockStorage0, name]}
-                          - 'novalocal'
             - Fn::Join:
               - "\n"
               - Merge::Map:
@@ -898,10 +893,6 @@ resources:
                     - ' '
                     - - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
                       - {get_attr: [SwiftStorage0, name]}
-                      - Fn::Join:
-                        - '.'
-                        - - {get_attr: [SwiftStorage0, name]}
-                          - 'novalocal'
             - Fn::Join:
               - "\n"
               - Merge::Map:
@@ -910,10 +901,6 @@ resources:
                     - ' '
                     - - {get_attr: [controller0, networks, ctlplane, 0]}
                       - {get_attr: [controller0, name]}
-                      - Fn::Join:
-                        - '.'
-                        - - {get_attr: [controller0, name]}
-                          - 'novalocal'
                       - {get_param: CloudName}
         rabbit:
           nodes: