Merge "Enable TLS for containerized haproxy"
authorJenkins <jenkins@review.openstack.org>
Thu, 17 Aug 2017 16:08:20 +0000 (16:08 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 17 Aug 2017 16:08:20 +0000 (16:08 +0000)
100 files changed:
README.rst
ci/common/net-config-multinode-os-net-config.yaml
ci/common/net-config-multinode.yaml
ci/environments/scenario001-multinode-containers.yaml
ci/environments/scenario004-multinode-containers.yaml
docker/firstboot/setup_docker_host.sh
docker/services/ceph-ansible/ceph-base.yaml
docker/services/database/mongodb.yaml
docker/services/nova-api.yaml
docker/services/nova-libvirt.yaml
docker/services/nova-placement.yaml
docker/services/pacemaker/database/mysql.yaml
docker/services/pacemaker/haproxy.yaml
environments/docker-centos-tripleoupstream.yaml [deleted file]
environments/major-upgrade-composable-steps.yaml
environments/network-isolation-v6.j2.yaml [new file with mode: 0644]
environments/network-isolation-v6.yaml [deleted file]
environments/network-management-v6.yaml
environments/network-management.yaml
extraconfig/nova_metadata/krb-service-principals.j2.yaml [moved from extraconfig/nova_metadata/krb-service-principals.yaml with 65% similarity]
extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
j2_excludes.yaml
net-config-bond.yaml
net-config-bridge.yaml
net-config-linux-bridge.yaml
net-config-noop.yaml
net-config-static-bridge-with-external-dhcp.yaml
net-config-static-bridge.yaml
net-config-static.yaml
net-config-undercloud.yaml
network/config/bond-with-vlans/ceph-storage.yaml
network/config/bond-with-vlans/cinder-storage.yaml
network/config/bond-with-vlans/compute-dpdk.yaml
network/config/bond-with-vlans/compute.yaml
network/config/bond-with-vlans/controller-no-external.yaml
network/config/bond-with-vlans/controller-v6.yaml
network/config/bond-with-vlans/controller.yaml
network/config/bond-with-vlans/networker.yaml
network/config/bond-with-vlans/swift-storage.yaml
network/config/contrail/contrail-nic-config-compute.yaml
network/config/contrail/contrail-nic-config.yaml
network/config/multiple-nics/ceph-storage.yaml
network/config/multiple-nics/cinder-storage.yaml
network/config/multiple-nics/compute-dvr.yaml
network/config/multiple-nics/compute.yaml
network/config/multiple-nics/controller-v6.yaml
network/config/multiple-nics/controller.yaml
network/config/multiple-nics/networker.yaml
network/config/multiple-nics/swift-storage.yaml
network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml
network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml
network/config/single-nic-linux-bridge-vlans/compute.yaml
network/config/single-nic-linux-bridge-vlans/controller-v6.yaml
network/config/single-nic-linux-bridge-vlans/controller.yaml
network/config/single-nic-linux-bridge-vlans/networker.yaml
network/config/single-nic-linux-bridge-vlans/swift-storage.yaml
network/config/single-nic-vlans/ceph-storage.yaml
network/config/single-nic-vlans/cinder-storage.yaml
network/config/single-nic-vlans/compute.yaml
network/config/single-nic-vlans/controller-no-external.yaml
network/config/single-nic-vlans/controller-v6.yaml
network/config/single-nic-vlans/controller.yaml
network/config/single-nic-vlans/networker.yaml
network/config/single-nic-vlans/swift-storage.yaml
network/external.yaml [deleted file]
network/internal_api.yaml [deleted file]
network/internal_api_v6.yaml
network/management.yaml [deleted file]
network/network.network.j2.yaml
network/ports/internal_api.yaml
network/ports/internal_api_from_pool.yaml
network/ports/internal_api_from_pool_v6.yaml
network/ports/internal_api_v6.yaml
network/ports/net_ip_list_map.j2.yaml [moved from network/ports/net_ip_list_map.yaml with 84% similarity]
network/ports/net_ip_map.j2.yaml [new file with mode: 0644]
network/ports/net_ip_map.yaml [deleted file]
network/ports/net_vip_map_external.j2.yaml [new file with mode: 0644]
network/ports/net_vip_map_external.yaml [deleted file]
network/ports/net_vip_map_external_v6.j2.yaml [new file with mode: 0644]
network/ports/net_vip_map_external_v6.yaml [deleted file]
network/ports/storage_mgmt.yaml
network/ports/storage_mgmt_from_pool.yaml
network/ports/storage_mgmt_from_pool_v6.yaml
network/ports/storage_mgmt_v6.yaml
network/service_net_map.j2.yaml
network/storage.yaml [deleted file]
network/storage_mgmt.yaml [deleted file]
network/storage_mgmt_v6.yaml
network/tenant.yaml [deleted file]
overcloud-resource-registry-puppet.j2.yaml
overcloud.j2.yaml
puppet/all-nodes-config.yaml
puppet/cephstorage-role.yaml [deleted file]
puppet/services/neutron-plugin-ml2.yaml
puppet/services/pacemaker_remote.yaml
releasenotes/notes/deprecate-management-envs-bbc7fddb0ca871af.yaml [new file with mode: 0644]
releasenotes/notes/dont-unregister-on-delete-9708f7cbc73a0d2f.yaml [new file with mode: 0644]
releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml [new file with mode: 0644]
releasenotes/notes/neutron-ml2-overlay-ip-version-4f14932355847aa0.yaml [new file with mode: 0644]
tripleo_heat_templates/environment_generator.py

index 93c443b..94f4f63 100644 (file)
@@ -82,7 +82,7 @@ and should be executed according to the following table:
 | neutron-bgpvpn |             |             |             |      X      |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
 | ovn            |             |             |             |             |                 |      X       |
-+---------------------------------------------------------------------------------------------------------+
++----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
 | neutron-l2gw   |             |             |             |      X      |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
 | rabbitmq       |      X      |      X      |      X      |      X      |        X        |      X       |
index 6f4542b..9d45a9f 100644 (file)
@@ -15,7 +15,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -23,7 +23,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index f7e250e..6beb62f 100644 (file)
@@ -15,7 +15,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -23,7 +23,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 73dc5b1..a3bc8fc 100644 (file)
@@ -109,6 +109,7 @@ parameter_defaults:
   CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
+  CephPoolDefaultSize: 1
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
index 6d795f9..5590de2 100644 (file)
@@ -95,6 +95,7 @@ parameter_defaults:
   CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
+  CephPoolDefaultSize: 1
   SwiftCeilometerPipelineEnabled: false
   NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
   BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
index 8b4c6a0..af213bb 100755 (executable)
@@ -6,3 +6,6 @@ set -eux
 # Disable libvirtd since it conflicts with nova_libvirt container
 /usr/bin/systemctl disable libvirtd.service
 /usr/bin/systemctl stop libvirtd.service
+# Disable virtlogd since it conflicts with nova_virtlogd container
+/usr/bin/systemctl disable virtlogd.service
+/usr/bin/systemctl stop virtlogd.service
index 85fe060..52c4a65 100644 (file)
@@ -102,6 +102,33 @@ conditions:
       data: {get_param: DockerCephDaemonImage}
       expression: $.data.split('/')[0].matches('(\.|:)')
 
+resources:
+  DockerImageUrlParts:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        host:
+          if:
+          - custom_registry_host
+          - yaql:
+              expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[1]
+              data: {get_param: DockerCephDaemonImage}
+          - docker.io
+        image:
+          if:
+          - custom_registry_host
+          - yaql:
+              expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[2]
+              data: {get_param: DockerCephDaemonImage}
+          - yaql:
+              expression: $.data.rightSplit(':', 1)[0]
+              data: {get_param: DockerCephDaemonImage}
+        image_tag:
+          yaql:
+            expression: $.data.rightSplit(':', 1)[1]
+            data: {get_param: DockerCephDaemonImage}
+
 outputs:
   role_data:
     description: Role data for the Ceph base service.
@@ -125,21 +152,9 @@ outputs:
         ceph_common_ansible_vars:
           fsid: { get_param: CephClusterFSID }
           docker: true
-          ceph_docker_registry:
-            if:
-            - custom_registry_host
-            - yaql:
-                expression: regex('(?:https?://)?(.*)/').split($.data)[1]
-                data: {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-            - docker.io
-          ceph_docker_image:
-            if:
-            - custom_registry_host
-            - yaql:
-                expression: regex('(?:https?://)?(.*)/').split($.data)[2]
-                data: {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-            - {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-          ceph_docker_image_tag: {str_split: [':', {get_param: DockerCephDaemonImage}, 1]}
+          ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
+          ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
+          ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
           containerized_deployment: true
           public_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
           monitor_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
@@ -186,11 +201,7 @@ outputs:
                  CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
                  GLANCE_POOL: {get_param: GlanceRbdPoolName}
                  GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
-            acls:
-            - "u:glance:r--"
-            - "u:nova:r--"
-            - "u:cinder:r--"
-            - "u:gnocchi:r--"
+            mode: "0644"
           keys: *openstack_keys
           pools: []
           ceph_conf_overrides:
index 5ba79b3..9b5c5b8 100644 (file)
@@ -36,6 +36,18 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  EnableInternalTLS:
+    type: boolean
+    default: false
+  InternalTLSCAFile:
+    default: '/etc/ipa/ca.crt'
+    type: string
+    description: Specifies the default CA cert to use if TLS is used for
+                 services in the internal network.
+
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 resources:
 
@@ -77,6 +89,10 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-tls/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/lib/mongodb
               owner: mongodb:mongodb
@@ -84,6 +100,8 @@ outputs:
             - path: /var/log/mongodb
               owner: mongodb:mongodb
               recurse: true
+            - path: /etc/pki/tls/certs/mongodb.pem
+              owner: mongodb:mongodb
       docker_config:
         step_2:
           mongodb:
@@ -91,11 +109,21 @@ outputs:
             net: host
             privileged: false
             volumes: &mongodb_volumes
-              - /var/lib/kolla/config_files/mongodb.json:/var/lib/kolla/config_files/config.json
-              - /var/lib/config-data/puppet-generated/mongodb/:/var/lib/kolla/config_files/src:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /var/log/containers/mongodb:/var/log/mongodb
-              - /var/lib/mongodb:/var/lib/mongodb
+              list_concat:
+                - - /var/lib/kolla/config_files/mongodb.json:/var/lib/kolla/config_files/config.json
+                  - /var/lib/config-data/puppet-generated/mongodb/:/var/lib/kolla/config_files/src:ro
+                  - /etc/localtime:/etc/localtime:ro
+                  - /var/log/containers/mongodb:/var/log/mongodb
+                  - /var/lib/mongodb:/var/lib/mongodb
+                - if:
+                  - internal_tls_enabled
+                  - - list_join:
+                      - ':'
+                      - - {get_param: InternalTLSCAFile}
+                        - {get_param: InternalTLSCAFile}
+                        - 'ro'
+                    - /etc/pki/tls/certs/mongodb.pem:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/mongodb.pem:ro
+                  - null
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       docker_puppet_tasks:
@@ -106,8 +134,18 @@ outputs:
           step_config: 'include ::tripleo::profile::base::database::mongodb'
           config_image: *mongodb_config_image
           volumes:
-            - /var/lib/mongodb:/var/lib/mongodb
-            - /var/log/containers/mongodb:/var/log/mongodb
+            list_concat:
+              - - /var/lib/mongodb:/var/lib/mongodb
+                - /var/log/containers/mongodb:/var/log/mongodb
+              - if:
+                - internal_tls_enabled
+                - - list_join:
+                    - ':'
+                    - - {get_param: InternalTLSCAFile}
+                      - {get_param: InternalTLSCAFile}
+                      - 'ro'
+                  - /etc/pki/tls/certs/mongodb.pem:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/mongodb.pem:ro
+                - null
       host_prep_tasks:
         - name: create persistent directories
           file:
@@ -116,6 +154,8 @@ outputs:
           with_items:
             - /var/log/containers/mongodb
             - /var/lib/mongodb
+      metadata_settings:
+        get_attr: [MongodbPuppetBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: Stop and disable mongodb service
           tags: step2
index 3f40130..be2c8a5 100644 (file)
@@ -36,6 +36,13 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  EnableInternalTLS:
+    type: boolean
+    default: false
+
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 resources:
 
@@ -64,9 +71,6 @@ outputs:
         map_merge:
           - get_attr: [NovaApiBase, role_data, config_settings]
           - apache::default_vhost: false
-            nova_wsgi_enabled: false
-            nova::api::service_name: '%{::nova::params::api_service_name}'
-            nova::wsgi::apache_api::ssl: false
       step_config: &step_config
         list_join:
           - "\n"
@@ -82,7 +86,7 @@ outputs:
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_api.json:
-          command: /usr/bin/nova-api
+          command: /usr/sbin/httpd -DFOREGROUND
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -112,7 +116,7 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/nova:/var/log/nova
-            command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
+            command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R nova:nova /var/log/nova']
         step_3:
           nova_api_db_sync:
             start_order: 0
@@ -164,7 +168,7 @@ outputs:
             start_order: 2
             image: *nova_api_image
             net: host
-            user: nova
+            user: root
             privileged: true
             restart: always
             volumes:
@@ -174,6 +178,16 @@ outputs:
                   - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/nova:/var/log/nova
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                      - ''
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                      - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           nova_api_cron:
index 916b057..7637e6e 100644 (file)
@@ -12,10 +12,6 @@ parameters:
   DockerNovaLibvirtConfigImage:
     description: The container image to use for the nova_libvirt config_volume
     type: string
-  EnablePackageInstall:
-    default: 'false'
-    description: Set to true to enable package installation at deploy time
-    type: boolean
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -144,13 +140,45 @@ outputs:
               dest: "/etc/ceph/"
               merge: true
               preserve_properties: true
+        /var/lib/kolla/config_files/nova_virtlogd.json:
+          command: /usr/sbin/virtlogd --config /etc/libvirt/virtlogd.conf
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/nova
               owner: nova:nova
               recurse: true
       docker_config:
         step_3:
+          nova_virtlogd:
+            start_order: 0
+            image: {get_param: DockerNovaLibvirtImage}
+            net: host
+            pid: host
+            privileged: true
+            restart: always
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova_virtlogd.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /dev:/dev
+                  - /run:/run
+                  - /sys/fs/cgroup:/sys/fs/cgroup
+                  - /var/lib/nova:/var/lib/nova
+                  - /var/run/libvirt:/var/run/libvirt
+                  - /var/lib/libvirt:/var/lib/libvirt
+                  - /etc/libvirt/qemu:/etc/libvirt/qemu:ro
+                  - /var/log/libvirt/qemu:/var/log/libvirt/qemu
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           nova_libvirt:
+            start_order: 1
             image: {get_param: DockerNovaLibvirtImage}
             net: host
             pid: host
@@ -169,7 +197,6 @@ outputs:
                   - /sys/fs/cgroup:/sys/fs/cgroup
                   - /var/lib/nova:/var/lib/nova
                   - /etc/libvirt:/etc/libvirt
-                  # Needed to use host's virtlogd
                   - /var/run/libvirt:/var/run/libvirt
                   - /var/lib/libvirt:/var/lib/libvirt
                   - /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
@@ -216,22 +243,6 @@ outputs:
           file:
             path: /etc/ceph
             state: directory
-        - name: set enable_package_install fact
-          set_fact:
-            enable_package_install: {get_param: EnablePackageInstall}
-        # We use virtlogd on host, so when using Deployed Server
-        # feature, we need to ensure libvirt is installed.
-        - name: install libvirt-daemon
-          package:
-            name: libvirt-daemon
-            state: present
-          when: enable_package_install
-        - name: start virtlogd socket
-          service:
-            name: virtlogd.socket
-            state: started
-            enabled: yes
-          when: enable_package_install
       upgrade_tasks:
         - name: Stop and disable libvirtd service
           tags: step2
index d784ace..26d1756 100644 (file)
@@ -36,6 +36,13 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  EnableInternalTLS:
+    type: boolean
+    default: false
+
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 resources:
 
@@ -104,6 +111,16 @@ outputs:
                   - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova_placement/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/nova:/var/log/nova
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                      - ''
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                      - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       metadata_settings:
index 3fb3834..8ba7d72 100644 (file)
@@ -43,6 +43,14 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  EnableInternalTLS:
+    type: boolean
+    default: false
+  InternalTLSCAFile:
+    default: '/etc/ipa/ca.crt'
+    type: string
+    description: Specifies the default CA cert to use if TLS is used for
+                 services in the internal network.
 
 resources:
 
@@ -59,6 +67,10 @@ resources:
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+
 outputs:
   role_data:
     description: Containerized service MySQL using composable services.
@@ -79,6 +91,13 @@ outputs:
                   - 4567
                   - 4568
                   - 9200
+          -
+            if:
+            - internal_tls_enabled
+            -
+              tripleo::profile::pacemaker::database::mysql_bundle::ca_file:
+                get_param: InternalTLSCAFile
+            - {}
       step_config: ""
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -103,6 +122,20 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-tls/*"
+              dest: "/"
+              merge: true
+              optional: true
+              preserve_properties: true
+          permissions:
+            - path: /etc/pki/tls/certs/mysql.crt
+              owner: mysql:mysql
+              perm: '0600'
+              optional: true
+            - path: /etc/pki/tls/private/mysql.key
+              owner: mysql:mysql
+              perm: '0600'
+              optional: true
       docker_config:
         step_1:
           mysql_data_ownership:
@@ -195,6 +228,8 @@ outputs:
           file:
             path: /var/lib/mysql
             state: directory
+      metadata_settings:
+        get_attr: [MysqlPuppetBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: get bootstrap nodeid
           tags: common
@@ -220,3 +255,9 @@ outputs:
         - name: Disable mysql service
           tags: step2
           service: name=mariadb enabled=no
+        - name: Remove clustercheck service from xinetd
+          tags: step2
+          file: state=absent path=/etc/xinetd.d/galera-monitor
+        - name: Restart xinetd service after clustercheck removal
+          tags: step2
+          service: name=xinetd state=restarted
index 2415591..5ba54f8 100644 (file)
@@ -41,6 +41,22 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  InternalTLSCAFile:
+    default: '/etc/ipa/ca.crt'
+    type: string
+    description: Specifies the default CA cert to use if TLS is used for
+                 services in the internal network.
+  InternalTLSCRLPEMFile:
+    default: '/etc/pki/CA/crl/overcloud-crl.pem'
+    type: string
+    description: Specifies the default CRL PEM file to use for revocation if
+                 TLS is used for services in the internal network.
+  HAProxyInternalTLSCertsDirectory:
+    default: '/etc/pki/tls/certs/haproxy'
+    type: string
+  HAProxyInternalTLSKeysDirectory:
+    default: '/etc/pki/tls/private/haproxy'
+    type: string
 
 resources:
 
@@ -65,6 +81,17 @@ outputs:
           - tripleo::haproxy::haproxy_daemon: false
             haproxy_docker: true
             tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: DockerHAProxyImage}
+            # the list of directories that contain the certs to bind mount in the countainer
+            # bind-mounting the directories rather than all the cert, key and pem files ensures
+            # that docker won't create directories on the host when then pem files do not exist
+            tripleo::profile::pacemaker::haproxy_bundle::tls_mapping: &tls_mapping
+              - get_param: InternalTLSCAFile
+              - get_param: HAProxyInternalTLSKeysDirectory
+              - get_param: HAProxyInternalTLSCertsDirectory
+            tripleo::profile::pacemaker::haproxy_bundle::internal_certs_directory: {get_param: HAProxyInternalTLSCertsDirectory}
+            tripleo::profile::pacemaker::haproxy_bundle::internal_keys_directory: {get_param: HAProxyInternalTLSKeysDirectory}
+            # disable the use CRL file until we can restart the container when the file expires
+            tripleo::haproxy::crl_file: null
       step_config: ""
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
@@ -80,11 +107,9 @@ outputs:
               - 'include ::tripleo::profile::pacemaker::haproxy_bundle'
         config_image: {get_param: DockerHAProxyConfigImage}
         volumes: &deployed_cert_mount
-          - list_join:
-            - ':'
-            - - {get_param: DeployedSSLCertificatePath}
-              - {get_param: DeployedSSLCertificatePath}
-              - 'ro'
+          yaql:
+            expression: $.data.select($+":"+$+":ro")
+            data: *tls_mapping
       kolla_config:
         /var/lib/kolla/config_files/haproxy.json:
           command: haproxy -f /etc/haproxy/haproxy.cfg
@@ -94,6 +119,28 @@ outputs:
               merge: true
               preserve_properties: true
               optional: true
+            - source: "/var/lib/kolla/config_files/src-tls/*"
+              dest: "/"
+              merge: true
+              optional: true
+              preserve_properties: true
+          permissions:
+            - path:
+                list_join:
+                - ''
+                - - {get_param: HAProxyInternalTLSCertsDirectory}
+                  - '/*'
+              owner: haproxy:haproxy
+              perm: '0600'
+              optional: true
+            - path:
+                list_join:
+                - ''
+                - - {get_param: HAProxyInternalTLSKeysDirectory}
+                  - '/*'
+              owner: haproxy:haproxy
+              perm: '0600'
+              optional: true
       docker_config:
         step_2:
           haproxy_init_bundle:
diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
deleted file mode 100644 (file)
index 47f8e52..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Generated with the following on 2017-07-12T11:40:50.219622
-#
-#   overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
-#
-
-parameter_defaults:
-  DockerAodhApiImage: tripleoupstream/centos-binary-aodh-api:latest
-  DockerAodhConfigImage: tripleoupstream/centos-binary-aodh-api:latest
-  DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest
-  DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest
-  DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest
-  DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest
-  DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest
-  DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest
-  DockerCeilometerIpmiImage: tripleoupstream/centos-binary-ceilometer-ipmi:latest
-  DockerCeilometerNotificationImage: tripleoupstream/centos-binary-ceilometer-notification:latest
-  DockerCinderApiImage: tripleoupstream/centos-binary-cinder-api:latest
-  DockerCinderBackupImage: tripleoupstream/centos-binary-cinder-backup:latest
-  DockerCinderConfigImage: tripleoupstream/centos-binary-cinder-api:latest
-  DockerCinderSchedulerImage: tripleoupstream/centos-binary-cinder-scheduler:latest
-  DockerCinderVolumeImage: tripleoupstream/centos-binary-cinder-volume:latest
-  DockerClustercheckConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerClustercheckImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerCollectdConfigImage: tripleoupstream/centos-binary-collectd:latest
-  DockerCollectdImage: tripleoupstream/centos-binary-collectd:latest
-  DockerCongressApiImage: tripleoupstream/centos-binary-congress-api:latest
-  DockerCongressConfigImage: tripleoupstream/centos-binary-congress-api:latest
-  DockerEc2ApiConfigImage: tripleoupstream/centos-binary-ec2-api:latest
-  DockerEc2ApiImage: tripleoupstream/centos-binary-ec2-api:latest
-  DockerEtcdConfigImage: tripleoupstream/centos-binary-etcd:latest
-  DockerEtcdImage: tripleoupstream/centos-binary-etcd:latest
-  DockerGlanceApiConfigImage: tripleoupstream/centos-binary-glance-api:latest
-  DockerGlanceApiImage: tripleoupstream/centos-binary-glance-api:latest
-  DockerGnocchiApiImage: tripleoupstream/centos-binary-gnocchi-api:latest
-  DockerGnocchiConfigImage: tripleoupstream/centos-binary-gnocchi-api:latest
-  DockerGnocchiMetricdImage: tripleoupstream/centos-binary-gnocchi-metricd:latest
-  DockerGnocchiStatsdImage: tripleoupstream/centos-binary-gnocchi-statsd:latest
-  DockerHAProxyConfigImage: tripleoupstream/centos-binary-haproxy:latest
-  DockerHAProxyImage: tripleoupstream/centos-binary-haproxy:latest
-  DockerHeatApiCfnConfigImage: tripleoupstream/centos-binary-heat-api-cfn:latest
-  DockerHeatApiCfnImage: tripleoupstream/centos-binary-heat-api-cfn:latest
-  DockerHeatApiConfigImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatApiImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatConfigImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatEngineImage: tripleoupstream/centos-binary-heat-engine:latest
-  DockerHorizonConfigImage: tripleoupstream/centos-binary-horizon:latest
-  DockerHorizonImage: tripleoupstream/centos-binary-horizon:latest
-  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
-  DockerIronicApiConfigImage: tripleoupstream/centos-binary-ironic-api:latest
-  DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest
-  DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest
-  DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest
-  DockerIronicInspectorImage: tripleoupstream/centos-binary-ironic-inspector:latest
-  DockerIronicPxeImage: tripleoupstream/centos-binary-ironic-pxe:latest
-  DockerIscsidConfigImage: tripleoupstream/centos-binary-iscsid:latest
-  DockerIscsidImage: tripleoupstream/centos-binary-iscsid:latest
-  DockerKeystoneConfigImage: tripleoupstream/centos-binary-keystone:latest
-  DockerKeystoneImage: tripleoupstream/centos-binary-keystone:latest
-  DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest
-  DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest
-  DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest
-  DockerManilaShareImage: tripleoupstream/centos-binary-manila-share:latest
-  DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest
-  DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest
-  DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest
-  DockerMistralConfigImage: tripleoupstream/centos-binary-mistral-api:latest
-  DockerMistralEngineImage: tripleoupstream/centos-binary-mistral-engine:latest
-  DockerMistralExecutorImage: tripleoupstream/centos-binary-mistral-executor:latest
-  DockerMongodbConfigImage: tripleoupstream/centos-binary-mongodb:latest
-  DockerMongodbImage: tripleoupstream/centos-binary-mongodb:latest
-  DockerMultipathdConfigImage: tripleoupstream/centos-binary-multipathd:latest
-  DockerMultipathdImage: tripleoupstream/centos-binary-multipathd:latest
-  DockerMysqlClientConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerMysqlConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerMysqlImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerNeutronApiImage: tripleoupstream/centos-binary-neutron-server:latest
-  DockerNeutronConfigImage: tripleoupstream/centos-binary-neutron-server:latest
-  DockerNeutronDHCPImage: tripleoupstream/centos-binary-neutron-dhcp-agent:latest
-  DockerNeutronL3AgentImage: tripleoupstream/centos-binary-neutron-l3-agent:latest
-  DockerNeutronMetadataImage: tripleoupstream/centos-binary-neutron-metadata-agent:latest
-  DockerNovaApiImage: tripleoupstream/centos-binary-nova-api:latest
-  DockerNovaComputeImage: tripleoupstream/centos-binary-nova-compute:latest
-  DockerNovaComputeIronicImage: tripleoupstream/centos-binary-nova-compute-ironic:latest
-  DockerNovaConductorImage: tripleoupstream/centos-binary-nova-conductor:latest
-  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-base:latest
-  DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest
-  DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest
-  DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest
-  DockerNovaPlacementConfigImage: tripleoupstream/centos-binary-nova-placement-api:latest
-  DockerNovaPlacementImage: tripleoupstream/centos-binary-nova-placement-api:latest
-  DockerNovaSchedulerImage: tripleoupstream/centos-binary-nova-scheduler:latest
-  DockerNovaVncProxyImage: tripleoupstream/centos-binary-nova-novncproxy:latest
-  DockerOVNControllerConfigImage: tripleoupstream/centos-binary-ovn-controller:latest
-  DockerOVNControllerImage: tripleoupstream/centos-binary-ovn-controller:latest
-  DockerOVNNbDbImage: tripleoupstream/centos-binary-ovn-nb-db-server:latest
-  DockerOVNNorthdImage: tripleoupstream/centos-binary-ovn-northd:latest
-  DockerOVNSbDbImage: tripleoupstream/centos-binary-ovn-sb-db-server:latest
-  DockerOctaviaApiImage: tripleoupstream/centos-binary-octavia-api:latest
-  DockerOctaviaConfigImage: tripleoupstream/centos-binary-octavia-api:latest
-  DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
-  DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
-  DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
-  DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
-  DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
-  DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest
-  DockerRabbitmqConfigImage: tripleoupstream/centos-binary-rabbitmq:latest
-  DockerRabbitmqImage: tripleoupstream/centos-binary-rabbitmq:latest
-  DockerRedisConfigImage: tripleoupstream/centos-binary-redis:latest
-  DockerRedisImage: tripleoupstream/centos-binary-redis:latest
-  DockerSaharaApiImage: tripleoupstream/centos-binary-sahara-api:latest
-  DockerSaharaConfigImage: tripleoupstream/centos-binary-sahara-api:latest
-  DockerSaharaEngineImage: tripleoupstream/centos-binary-sahara-engine:latest
-  DockerSensuClientImage: tripleoupstream/centos-binary-sensu-client:latest
-  DockerSensuConfigImage: tripleoupstream/centos-binary-sensu-client:latest
-  DockerSwiftAccountImage: tripleoupstream/centos-binary-swift-account:latest
-  DockerSwiftConfigImage: tripleoupstream/centos-binary-swift-proxy-server:latest
-  DockerSwiftContainerImage: tripleoupstream/centos-binary-swift-container:latest
-  DockerSwiftObjectImage: tripleoupstream/centos-binary-swift-object:latest
-  DockerSwiftProxyImage: tripleoupstream/centos-binary-swift-proxy-server:latest
-  DockerTackerConfigImage: tripleoupstream/centos-binary-tacker:latest
-  DockerTackerImage: tripleoupstream/centos-binary-tacker:latest
-  DockerZaqarConfigImage: tripleoupstream/centos-binary-zaqar:latest
-  DockerZaqarImage: tripleoupstream/centos-binary-zaqar:latest
index 5a69517..db83f90 100644 (file)
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
+  OS::TripleO::PostDeploySteps: ../common/major_upgrade_steps.yaml
 parameter_defaults:
   EnableConfigPurge: true
   StackUpdateType: UPGRADE
diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml
new file mode 100644 (file)
index 0000000..bb27ee4
--- /dev/null
@@ -0,0 +1,58 @@
+{%- set primary_role = [roles[0]] -%}
+{%- for role in roles -%}
+  {%- if 'primary' in role.tags and 'controller' in role.tags -%}
+    {%- set _ = primary_role.pop() -%}
+    {%- set _ = primary_role.append(role) -%}
+  {%- endif -%}
+{%- endfor -%}
+{%- set primary_role_name = primary_role[0].name -%}
+# Enable the creation of Neutron networks for isolated Overcloud
+# traffic and configure each role to assign ports (related
+# to that role) on these networks.
+# primary role is: {{primary_role_name}}
+resource_registry:
+  # networks as defined in network_data.yaml
+  {%- for network in networks if network.enabled|default(true) %}
+    {%- if network.name != 'Tenant' %}
+  OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+    {%- else %}
+    # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
+  OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
+    {%- endif %}
+  {%- endfor %}
+
+  # Port assignments for the VIPs
+  {%- for network in networks if network.vip and network.enabled|default(true) %}
+  OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+  {%- endfor %}
+
+  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
+
+{%- for role in roles %}
+  # Port assignments for the {{role.name}}
+  {%- for network in networks %}
+    {%- if network.name in role.networks|default([]) and network.enabled|default(true) and network.name != 'Tenant' %}
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+    {%- elif network.name in role.networks|default([]) and network.enabled|default(true) and network.name == 'Tenant' %}
+    # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
+    {%- else %}
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/noop.yaml
+    {%- endif %}
+  {%- endfor %}
+{%- endfor %}
+
+
+parameter_defaults:
+  # Enable IPv6 for Ceph.
+  CephIPv6: True
+  # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster.
+  CorosyncIPv6: True
+  # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP.
+  MongoDbIPv6: True
+  # Enable various IPv6 features in Nova.
+  NovaIPv6: True
+  # Enable IPv6 environment for RabbitMQ.
+  RabbitIPv6: True
+  # Enable IPv6 environment for Memcached.
+  MemcachedIPv6: True
diff --git a/environments/network-isolation-v6.yaml b/environments/network-isolation-v6.yaml
deleted file mode 100644 (file)
index 11ca5b3..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# Enable the creation of IPv6 Neutron networks for isolated Overcloud
-# traffic and configure each role to assign ports (related
-# to that role) on these networks.
-resource_registry:
-  OS::TripleO::Network::External: ../network/external_v6.yaml
-  OS::TripleO::Network::InternalApi: ../network/internal_api_v6.yaml
-  OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt_v6.yaml
-  OS::TripleO::Network::Storage: ../network/storage_v6.yaml
-  # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
-  OS::TripleO::Network::Tenant: ../network/tenant.yaml
-
-  # Port assignments for the VIPs
-  OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_v6.yaml
-  OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt_v6.yaml
-  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
-
-  # Port assignments for the controller role
-  OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_v6.yaml
-  OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-  OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
-
-  # Port assignments for the compute role
-  OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
-
-  # Port assignments for the ceph storage role
-  OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-  # Port assignments for the swift storage role
-  OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-  # Port assignments for the block storage role
-  OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::BlockStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::BlockStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-parameter_defaults:
-  # Enable IPv6 for Ceph.
-  CephIPv6: True
-  # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster.
-  CorosyncIPv6: True
-  # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP.
-  MongoDbIPv6: True
-  # Enable various IPv6 features in Nova.
-  NovaIPv6: True
-  # Enable IPv6 environment for RabbitMQ.
-  RabbitIPv6: true
-  # Enable IPv6 environment for Memcached.
-  MemcachedIPv6: true
index 812e84f..5905621 100644 (file)
@@ -1,3 +1,7 @@
+# ******************************************************************************
+# DEPRECATED: Use tripleo-heat-templates/environments/network-isolation-v6.yaml
+# and define the needed networks in your custom role file.
+# ******************************************************************************
 # Enable the creation of an IPv6 system management network. This
 # creates a Neutron network for isolated Overcloud
 # system management traffic and configures each role to
index 041617b..5f50bb1 100644 (file)
@@ -1,3 +1,7 @@
+# ***************************************************************************
+# DEPRECATED: Use tripleo-heat-templates/environments/network-isolation.yaml
+# and define the needed networks in your custom role file.
+# ***************************************************************************
 # Enable the creation of a system management network. This
 # creates a Neutron network for isolated Overcloud
 # system management traffic and configures each role to
@@ -5,30 +5,38 @@ parameters:
   RoleData:
      type: json
      description: the list containing the 'role_data' output for the ServiceChain
-
-  # Coming from parameter_defaults
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # Special case the External hostname param, which is CloudName
   CloudName:
     default: overcloud.localdomain
     description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
     type: string
+{%- elif network.name == 'InternalApi' %}
+  # Special case the Internal API hostname param, which is CloudNameInternal
   CloudNameInternal:
-    default: overcloud.internalapi.localdomain
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's internal API endpoint. E.g.
-      'ci-overcloud.internalapi.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
-  CloudNameStorage:
-    default: overcloud.storage.localdomain
+{%- elif network.name == 'StorageMgmt' %}
+  # Special case StorageMgmt hostname param, which is CloudNameStorageManagement
+  CloudNameStorageManagement:
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's storage endpoint. E.g.
-      'ci-overcloud.storage.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
-  CloudNameStorageManagement:
-    default: overcloud.storagemgmt.localdomain
+{%- else %}
+  CloudName{{network.name}}:
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's storage management endpoint. E.g.
-      'ci-overcloud.storagemgmt.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
+{%- endif %}
+{%- endfor %}
   CloudNameCtlplane:
     default: overcloud.ctlplane.localdomain
     description: >
@@ -61,10 +69,17 @@ resources:
           data:
             metadata: {get_attr: [IncomingMetadataSettings, value]}
             fqdns:
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
               external: {get_param: CloudName}
+{%- elif network.name == 'InternalApi' %}
               internal_api: {get_param: CloudNameInternal}
-              storage: {get_param: CloudNameStorage}
+{%- elif network.name == 'StorageMgmt' %}
               storage_mgmt: {get_param: CloudNameStorageManagement}
+{%- else %}
+              {{network.name_lower}}: {get_param: CloudName{{network.name}}}
+{%- endif %}
+{%- endfor %}
               ctlplane: {get_param: CloudNameCtlplane}
 
   CompactServices:
@@ -82,3 +97,4 @@ outputs:
       map_merge:
         - {get_attr: [IndividualServices, value]}
         - compact_services: {get_attr: [CompactServices, value]}
+
index fb0d169..b9fd08b 100644 (file)
@@ -59,22 +59,31 @@ parameters:
     description: |
       When enabled, the system will perform a yum update after performing the
       RHEL Registration process.
-  deployment_actions:
-    default: ['CREATE', 'UPDATE']
-    type: comma_delimited_list
-    description: >
-      List of stack actions that will trigger any deployments in this
-      templates. The actions will be an empty list of the server is in the
-      toplevel DeploymentServerBlacklist parameter's value.
+  DeleteOnRHELUnregistration:
+    type: boolean
+    default: false
+    description: |
+      When true, the system profile will be deleted from the registration
+      service when the rhel-registration.yaml nested stack is deleted.
 
 conditions:
-  deployment_actions_empty:
+  unregister_on_delete:
     equals:
-      - {get_param: deployment_actions}
-      - []
+      - {get_param: DeleteOnRHELUnregistration}
+      - true
+  update_requested:
+    equals:
+      - {get_param: UpdateOnRHELRegistration}
+      - true
 
 resources:
 
+  DeploymentActions:
+    type: OS::Heat::Value
+    properties:
+      value:
+        yaql
+
   RHELRegistration:
     type: OS::Heat::SoftwareConfig
     properties:
@@ -151,9 +160,9 @@ resources:
       config: {get_resource: RHELUnregistration}
       actions:
         if:
-          - deployment_actions_empty
+          - unregister_on_delete
+          - ['DELETE']
           - []
-          - ['DELETE'] # Only do this on DELETE
       input_values:
         REG_METHOD: {get_param: rhel_reg_method}
 
@@ -180,17 +189,12 @@ resources:
   UpdateDeploymentAfterRHELRegistration:
     type: OS::Heat::SoftwareDeployment
     depends_on: RHELRegistrationDeployment
-    conditions:
-      update_requested: {get_param: UpdateOnRHELRegistration}
+    condition: update_requested
     properties:
       name: UpdateDeploymentAfterRHELRegistration
       config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}
       server:  {get_param: server}
-      actions:
-        if:
-          - deployment_actions_empty
-          - []
-          - ['CREATE'] # Only do this on CREATE
+      actions: ['CREATE'] # Only do this on CREATE
 
 outputs:
   deploy_stdout:
index 504cc15..5bdb0af 100644 (file)
@@ -1,14 +1,10 @@
 # This template specifies which j2 rendered templates
 # should be excluded in the render process from
 # tripleo-common/tripleo_common/actions/templates.py
+# E.g:
+# name:
+#   - puppet/cephstorage-role.yaml
 name:
-  - puppet/cephstorage-role.yaml
-  - network/internal_api.yaml
-  - network/external.yaml
-  - network/storage.yaml
-  - network/storage_mgmt.yaml
-  - network/tenant.yaml
-  - network/management.yaml
   - network/internal_api_v6.yaml
   - network/external_v6.yaml
   - network/storage_v6.yaml
index 95b4745..8a97c85 100644 (file)
@@ -22,7 +22,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -30,7 +30,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 29646ab..0668245 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 6c44e60..3964341 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 57f1a19..bdfda57 100644 (file)
@@ -15,7 +15,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -23,7 +23,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index cbf282e..0e0d590 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index c778bd8..e3e930d 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index e864be0..02e2fe6 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 881fbfd..df02833 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 9683456..bd15a18 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 3ad6d65..4ea3c47 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 095c497..5def1ca 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 882402a..2acbc87 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 4901f94..5560351 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 33c6fa6..69ab753 100644 (file)
@@ -14,7 +14,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -22,7 +22,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 100821b..70e41eb 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index aa6e9da..45994c7 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 0ede081..c31bf22 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index a5f0eca..5f9e919 100644 (file)
@@ -16,7 +16,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   InternalApiDefaultRoute: # Not used by default in this template
     default: '10.0.0.1'
@@ -28,7 +28,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 595f34d..fb78cac 100644 (file)
@@ -16,7 +16,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   InternalApiDefaultRoute: # Not used by default in this template
     default: '10.0.0.1'
@@ -28,7 +28,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 3cc4361..8448f84 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index fa7d49e..57882e2 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index a793912..562a63d 100644 (file)
@@ -13,7 +13,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -21,7 +21,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index d1dc06a..febfed0 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 477eeaa..17544f2 100644 (file)
@@ -13,7 +13,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -21,7 +21,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 59f16b9..7d9dbe7 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index b251fb9..abee66c 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 180f553..cf54791 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 6685f2b..b22f633 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index ecc57ad..1c5a8c9 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index a637ef0..f4fd5fb 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index d405807..44fc961 100644 (file)
@@ -13,7 +13,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -21,7 +21,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index a52a8b8..0a54145 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index b1733de..7dd4894 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index ad154fa..2649391 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 790e8a7..ebcc721 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 6dee3be..d2548e4 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index d2559d2..78814af 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index d26de32..1dc9a6f 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 8f68760..f1055ae 100644 (file)
@@ -13,7 +13,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -21,7 +21,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 8530118..171fcf5 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index 54a17e4..2502984 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
index b4587e0..99ab66c 100644 (file)
@@ -12,7 +12,7 @@ parameters:
     type: string
   InternalApiIpSubnet:
     default: ''
-    description: IP address/subnet on the internal API network
+    description: IP address/subnet on the internal_api network
     type: string
   StorageIpSubnet:
     default: ''
@@ -20,7 +20,7 @@ parameters:
     type: string
   StorageMgmtIpSubnet:
     default: ''
-    description: IP address/subnet on the storage mgmt network
+    description: IP address/subnet on the storage_mgmt network
     type: string
   TenantIpSubnet:
     default: ''
diff --git a/network/external.yaml b/network/external.yaml
deleted file mode 100644 (file)
index 708d463..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-heat_template_version: pike
-
-description: >
-  External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  ExternalNetCidr:
-    default: '10.0.0.0/24'
-    description: Cidr for the external network.
-    type: string
-  ExternalNetValueSpecs:
-    default: {'provider:physical_network': 'external', 'provider:network_type': 'flat'}
-    description: Value specs for the external network.
-    type: json
-  ExternalNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  ExternalNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  ExternalNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  ExternalNetName:
-    default: external
-    description: The name of the external network.
-    type: string
-  ExternalSubnetName:
-    default: external_subnet
-    description: The name of the external subnet in Neutron.
-    type: string
-  ExternalAllocationPools:
-    default: [{'start': '10.0.0.4', 'end': '10.0.0.250'}]
-    description: Ip allocation pool range for the external network.
-    type: json
-  ExternalInterfaceDefaultRoute:
-    default: '10.0.0.1'
-    description: default route for the external network
-    type: string
-
-resources:
-  ExternalNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: ExternalNetAdminStateUp}
-      name: {get_param: ExternalNetName}
-      shared: {get_param: ExternalNetShared}
-      value_specs: {get_param: ExternalNetValueSpecs}
-
-  ExternalSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: ExternalNetCidr}
-      enable_dhcp: {get_param: ExternalNetEnableDHCP}
-      name: {get_param: ExternalSubnetName}
-      network: {get_resource: ExternalNetwork}
-      allocation_pools: {get_param: ExternalAllocationPools}
-      gateway_ip: {get_param: ExternalInterfaceDefaultRoute}
-
-outputs:
-  OS::stack_id:
-    description: Neutron external network
-    value: {get_resource: ExternalNetwork}
-  subnet_cidr:
-    value: {get_attr: [ExternalSubnet, cidr]}
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
deleted file mode 100644 (file)
index 6e1885a..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Internal API network. Used for most APIs, Database, RPC.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  InternalApiNetCidr:
-    default: '172.16.2.0/24'
-    description: Cidr for the internal API network.
-    type: string
-  InternalApiNetValueSpecs:
-    default: {'provider:physical_network': 'internal_api', 'provider:network_type': 'flat'}
-    description: Value specs for the internal API network.
-    type: json
-  InternalApiNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  InternalApiNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  InternalApiNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal API network.
-    type: string
-  InternalApiSubnetName:
-    default: internal_api_subnet
-    description: The name of the internal API subnet in Neutron.
-    type: string
-  InternalApiAllocationPools:
-    default: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
-    description: Ip allocation pool range for the internal API network.
-    type: json
-
-resources:
-  InternalApiNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: InternalApiNetAdminStateUp}
-      name: {get_param: InternalApiNetName}
-      shared: {get_param: InternalApiNetShared}
-      value_specs: {get_param: InternalApiNetValueSpecs}
-
-  InternalApiSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: InternalApiNetCidr}
-      enable_dhcp: {get_param: InternalApiNetEnableDHCP}
-      name: {get_param: InternalApiSubnetName}
-      network: {get_resource: InternalApiNetwork}
-      allocation_pools: {get_param: InternalApiAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron internal network
-    value: {get_resource: InternalApiNetwork}
-  subnet_cidr:
-    value: {get_attr: [InternalApiSubnet, cidr]}
index 7264b1c..6a0912e 100644 (file)
@@ -8,11 +8,11 @@ parameters:
   InternalApiNetCidr:
     # OpenStack uses the EUI-64 address format, which requires a /64 prefix
     default: 'fd00:fd00:fd00:2000::/64'
-    description: Cidr for the internal API network.
+    description: Cidr for the internal_api network.
     type: string
   InternalApiNetValueSpecs:
     default: {'provider:physical_network': 'internal_api', 'provider:network_type': 'flat'}
-    description: Value specs for the internal API network.
+    description: Value specs for the internal_api network.
     type: json
   InternalApiNetAdminStateUp:
     default: false
@@ -24,15 +24,15 @@ parameters:
     type: boolean
   InternalApiNetName:
     default: internal_api
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     type: string
   InternalApiSubnetName:
     default: internal_api_subnet
-    description: The name of the internal API subnet in Neutron.
+    description: The name of the internal_api subnet in Neutron.
     type: string
   InternalApiAllocationPools:
     default: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
-    description: Ip allocation pool range for the internal API network.
+    description: Ip allocation pool range for the internal_api network.
     type: json
   IPv6AddressMode:
     default: dhcpv6-stateful
diff --git a/network/management.yaml b/network/management.yaml
deleted file mode 100644 (file)
index be197e5..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Management network. System administration, SSH, DNS, NTP, etc. This network
-  would usually be the default gateway for the non-controller nodes.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  ManagementNetCidr:
-    default: '10.0.1.0/24'
-    description: Cidr for the management network.
-    type: string
-  ManagementNetValueSpecs:
-    default: {'provider:physical_network': 'management', 'provider:network_type': 'flat'}
-    description: Value specs for the management network.
-    type: json
-  ManagementNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  ManagementNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  ManagementNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  ManagementNetName:
-    default: management
-    description: The name of the management network.
-    type: string
-  ManagementSubnetName:
-    default: management_subnet
-    description: The name of the management subnet in Neutron.
-    type: string
-  ManagementAllocationPools:
-    default: [{'start': '10.0.1.4', 'end': '10.0.1.250'}]
-    description: Ip allocation pool range for the management network.
-    type: json
-  ManagementInterfaceDefaultRoute:
-    default: unset
-    description: The default route of the management network.
-    type: string
-
-resources:
-  ManagementNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: ManagementNetAdminStateUp}
-      name: {get_param: ManagementNetName}
-      shared: {get_param: ManagementNetShared}
-      value_specs: {get_param: ManagementNetValueSpecs}
-
-  ManagementSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: ManagementNetCidr}
-      enable_dhcp: {get_param: ManagementNetEnableDHCP}
-      name: {get_param: ManagementSubnetName}
-      network: {get_resource: ManagementNetwork}
-      allocation_pools: {get_param: ManagementAllocationPools}
-      gateway_ip: {get_param: ManagementInterfaceDefaultRoute}
-
-outputs:
-  OS::stack_id:
-    description: Neutron management network
-    value: {get_resource: ManagementNetwork}
-  subnet_cidr:
-    value: {get_attr: [ManagementSubnet, cidr]}
index ccf437b..29d58cd 100644 (file)
@@ -15,7 +15,7 @@ parameters:
     type: json
   {{network.name}}NetAdminStateUp:
     default: false
-    description: This admin state of the network.
+    description: The admin state of the network.
     type: boolean
   {{network.name}}NetEnableDHCP:
     default: false
@@ -27,7 +27,7 @@ parameters:
     type: boolean
   {{network.name}}NetName:
     default: {{network.name_lower}}
-    description: The name of the  {{network.name_lower}} network.
+    description: The name of the {{network.name_lower}} network.
     type: string
   {{network.name}}SubnetName:
     default: {{network.name_lower}}_subnet
@@ -38,7 +38,7 @@ parameters:
     description: Ip allocation pool range for the {{network.name_lower}} network.
     type: json
   {{network.name}}InterfaceDefaultRoute:
-    default: {{network.gateway_ip|default("not_defined")}}
+    default: {{network.gateway_ip|default('""')}}
     description: default route for the {{network.name_lower}} network
     type: string
 {%- if network.vlan %}
index e9eb787..9400643 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   InternalApiNetName:
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     default: internal_api
     type: string
   PortName:
index 31c72da..6eeca14 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   InternalApiNetName:
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     default: internal_api
     type: string
   PortName:
@@ -26,7 +26,7 @@ parameters:
     type: number
   InternalApiNetCidr:
     default: '172.16.2.0/24'
-    description: Cidr for the internal API network.
+    description: Cidr for the internal_api network.
     type: string
 
 outputs:
index 657310e..589d72a 100644 (file)
@@ -6,7 +6,7 @@ description: >
 
 parameters:
   InternalApiNetName:
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     default: internal_api
     type: string
   PortName:
@@ -27,7 +27,7 @@ parameters:
     type: number
   InternalApiNetCidr:
     default: 'fd00:fd00:fd00:2000::/64'
-    description: Cidr for the internal API network.
+    description: Cidr for the internal_api network.
     type: string
 
 outputs:
index 6a9e708..36a3ad0 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   InternalApiNetName:
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     default: internal_api
     type: string
   PortName:
similarity index 84%
rename from network/ports/net_ip_list_map.yaml
rename to network/ports/net_ip_list_map.j2.yaml
index a9111ed..e929ab2 100644 (file)
@@ -4,24 +4,11 @@ parameters:
   ControlPlaneIpList:
     default: []
     type: comma_delimited_list
-  ExternalIpList:
-    default: []
-    type: comma_delimited_list
-  InternalApiIpList:
-    default: []
-    type: comma_delimited_list
-  StorageIpList:
-    default: []
-    type: comma_delimited_list
-  StorageMgmtIpList:
-    default: []
-    type: comma_delimited_list
-  TenantIpList:
-    default: []
-    type: comma_delimited_list
-  ManagementIpList:
+{%- for network in networks %}
+  {{network.name}}IpList:
     default: []
     type: comma_delimited_list
+{%- endfor %}
   EnabledServices:
     default: []
     type: comma_delimited_list
@@ -37,7 +24,7 @@ parameters:
 
   InternalApiNetName:
     default: internal_api
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     type: string
   ExternalNetName:
     default: external
@@ -53,12 +40,17 @@ parameters:
     type: string
   StorageMgmtNetName:
     default: storage_mgmt
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     type: string
   TenantNetName:
     default: tenant
     description: The name of the tenant network.
+{%- for network in networks %}
+  {{network.name}}NetName:
+    default: {{network.name_lower}}
+    description: The name of the {{network.name_lower}} network.
     type: string
+{%- endfor %}
 
 
 resources:
@@ -91,19 +83,13 @@ resources:
       value:
         map_replace:
           - ctlplane: {get_param: ControlPlaneIpList}
-            external: {get_param: ExternalIpList}
-            internal_api: {get_param: InternalApiIpList}
-            storage: {get_param: StorageIpList}
-            storage_mgmt: {get_param: StorageMgmtIpList}
-            tenant: {get_param: TenantIpList}
-            management: {get_param: ManagementIpList}
+{%- for network in networks %}
+            {{network.name_lower}}: {get_param: {{network.name}}IpList}
+{%- endfor %}
           - keys:
-              external: {get_param: ExternalNetName}
-              internal_api: {get_param: InternalApiNetName}
-              storage: {get_param: StorageNetName}
-              storage_mgmt: {get_param: StorageMgmtNetName}
-              tenant: {get_param: TenantNetName}
-              management: {get_param: ManagementNetName}
+{%- for network in networks %}
+              {{network.name_lower}}: {get_param: {{network.name}}NetName}
+{%- endfor %}
 
 outputs:
   net_ip_map:
diff --git a/network/ports/net_ip_map.j2.yaml b/network/ports/net_ip_map.j2.yaml
new file mode 100644 (file)
index 0000000..f01d624
--- /dev/null
@@ -0,0 +1,81 @@
+heat_template_version: pike
+
+parameters:
+  ControlPlaneIp:
+    default: ''
+    type: string
+  ControlPlaneSubnetCidr: # Override this via parameter_defaults
+    default: '24'
+    description: The subnet CIDR of the control plane network.
+    type: string
+{%- for network in networks %}
+  {{network.name}}Ip:
+    default: ''
+    type: string
+  {{network.name}}IpSubnet:
+    description: 'IP address/subnet on the {{network.name_lower}} network'
+    default: ''
+    type: string
+  {{network.name}}IpUri:
+    default: ''
+    type: string
+    description: IP address with brackets in case of IPv6
+{%- endfor %}
+
+{%- for network in networks %}
+  {{network.name}}NetName:
+    default: {{network.name_lower}}
+    description: The name of the {{network.name_lower}} network.
+    type: string
+{%- endfor %}
+
+resources:
+
+  NetIpMapValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - ctlplane: {get_param: ControlPlaneIp}
+{%- for network in networks %}
+            {{network.name_lower}}: {get_param: {{network.name}}Ip}
+{%- endfor %}
+            ctlplane_subnet:
+              list_join:
+                - ''
+                - - {get_param: ControlPlaneIp}
+                  - '/'
+                  - {get_param: ControlPlaneSubnetCidr}
+{%- for network in networks %}
+            {{network.name_lower}}_subnet: {get_param: {{network.name}}IpSubnet}
+{%- endfor %}
+            ctlplane_uri: {get_param: ControlPlaneIp}
+{%- for network in networks %}
+            {{network.name_lower}}_uri: {get_param: {{network.name}}IpUri}
+{%- endfor %}
+          - keys:
+{%- for network in networks %}
+              {{network.name_lower}}: {get_param: {{network.name}}NetName}
+{%- endfor %}
+{%- for network in networks %}
+              {{network.name_lower}}_subnet:
+                str_replace:
+                  template: NAME_subnet
+                  params:
+                    NAME: {get_param: {{network.name}}NetName}
+{%- endfor %}
+{%- for network in networks %}
+              {{network.name_lower}}_uri:
+                str_replace:
+                  template: NAME_uri
+                  params:
+                    NAME: {get_param: {{network.name}}NetName}
+{%- endfor %}
+
+outputs:
+  net_ip_map:
+    description: >
+      A Hash containing a mapping of network names to assigned IPs
+      for a specific machine.
+    value: {get_attr: [NetIpMapValue, value]}
diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
deleted file mode 100644 (file)
index ce58e96..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-heat_template_version: pike
-
-parameters:
-  ControlPlaneIp:
-    default: ''
-    type: string
-  ControlPlaneSubnetCidr: # Override this via parameter_defaults
-    default: '24'
-    description: The subnet CIDR of the control plane network.
-    type: string
-  ExternalIp:
-    default: ''
-    type: string
-  ExternalIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the external network
-  ExternalIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  InternalApiIp:
-    default: ''
-    type: string
-  InternalApiIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the internal API network
-  InternalApiIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageIp:
-    default: ''
-    type: string
-  StorageIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the storage network
-  StorageIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageMgmtIp:
-    default: ''
-    type: string
-  StorageMgmtIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the storage mgmt network
-  StorageMgmtIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  TenantIp:
-    default: ''
-    type: string
-  TenantIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the tenant network
-  TenantIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  ManagementIp:
-    default: ''
-    type: string
-  ManagementIpSubnet:
-    default: ''
-    type: string
-    description: IP address/subnet on the management network
-  ManagementIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal API network.
-    type: string
-  ExternalNetName:
-    default: external
-    description: The name of the external network.
-    type: string
-  ManagementNetName:
-    default: management
-    description: The name of the management network.
-    type: string
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageMgmtNetName:
-    default: storage_mgmt
-    description: The name of the Storage management network.
-    type: string
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
-    type: string
-
-resources:
-
-  NetIpMapValue:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-        map_replace:
-          - ctlplane: {get_param: ControlPlaneIp}
-            external: {get_param: ExternalIp}
-            internal_api: {get_param: InternalApiIp}
-            storage: {get_param: StorageIp}
-            storage_mgmt: {get_param: StorageMgmtIp}
-            tenant: {get_param: TenantIp}
-            management: {get_param: ManagementIp}
-            ctlplane_subnet:
-              list_join:
-                - ''
-                - - {get_param: ControlPlaneIp}
-                  - '/'
-                  - {get_param: ControlPlaneSubnetCidr}
-            external_subnet: {get_param: ExternalIpSubnet}
-            internal_api_subnet: {get_param: InternalApiIpSubnet}
-            storage_subnet: {get_param: StorageIpSubnet}
-            storage_mgmt_subnet: {get_param: StorageMgmtIpSubnet}
-            tenant_subnet: {get_param: TenantIpSubnet}
-            management_subnet: {get_param: ManagementIpSubnet}
-            ctlplane_uri: {get_param: ControlPlaneIp}
-            external_uri: {get_param: ExternalIpUri}
-            internal_api_uri: {get_param: InternalApiIpUri}
-            storage_uri: {get_param: StorageIpUri}
-            storage_mgmt_uri: {get_param: StorageMgmtIpUri}
-            tenant_uri: {get_param: TenantIpUri}
-            management_uri: {get_param: ManagementIpUri}
-          - keys:
-              external: {get_param: ExternalNetName}
-              internal_api: {get_param: InternalApiNetName}
-              storage: {get_param: StorageNetName}
-              storage_mgmt: {get_param: StorageMgmtNetName}
-              tenant: {get_param: TenantNetName}
-              management: {get_param: ManagementNetName}
-              external_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: ExternalNetName}
-              internal_api_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: InternalApiNetName}
-              storage_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: StorageNetName}
-              storage_mgmt_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: StorageMgmtNetName}
-              tenant_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: TenantNetName}
-              management_subnet:
-                str_replace:
-                  template: NAME_subnet
-                  params:
-                    NAME: {get_param: ManagementNetName}
-              external_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: ExternalNetName}
-              internal_api_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: InternalApiNetName}
-              storage_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: StorageNetName}
-              storage_mgmt_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: StorageMgmtNetName}
-              tenant_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: TenantNetName}
-              management_uri:
-                str_replace:
-                  template: NAME_uri
-                  params:
-                    NAME: {get_param: ManagementNetName}
-
-outputs:
-  net_ip_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs
-      for a specific machine.
-    value: {get_attr: [NetIpMapValue, value]}
diff --git a/network/ports/net_vip_map_external.j2.yaml b/network/ports/net_vip_map_external.j2.yaml
new file mode 100644 (file)
index 0000000..b17f48b
--- /dev/null
@@ -0,0 +1,40 @@
+heat_template_version: pike
+
+parameters:
+  # Set these via parameter defaults to configure external VIPs
+  ControlPlaneIP:
+    default: ''
+    type: string
+{%- for network in networks if network.vip|default(false) %}
+  {{network.name}}NetworkVip:
+    default: ''
+    type: string
+{%- endfor %}
+  # The following are unused in this template
+  ControlPlaneIp:
+    default: ''
+    type: string
+{%- for network in networks if network.vip|default(false) %}
+  {{network.name}}Ip:
+    default: ''
+    type: string
+  {{network.name}}IpUri:
+    default: ''
+    type: string
+    description: IP address with brackets in case of IPv6
+{%- endfor %}
+
+outputs:
+  net_ip_map:
+    description: >
+      A Hash containing a mapping of network names to assigned IPs
+      for a specific machine.
+    value:
+      ctlplane: {get_param: ControlPlaneIP}
+{%- for network in networks if network.vip|default(false) %}
+      {{network.name_lower}}: {get_param: {{network.name}}NetworkVip}
+{%- endfor %}
+      ctlplane_uri: {get_param: ControlPlaneIP}
+{%- for network in networks if network.vip|default(false) %}
+      {{network.name_lower}}_uri: {get_param: {{network.name}}NetworkVip}
+{%- endfor %}
diff --git a/network/ports/net_vip_map_external.yaml b/network/ports/net_vip_map_external.yaml
deleted file mode 100644 (file)
index d084788..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-heat_template_version: pike
-
-parameters:
-  # Set these via parameter defaults to configure external VIPs
-  ControlPlaneIP:
-    default: ''
-    type: string
-  ExternalNetworkVip:
-    default: ''
-    type: string
-  InternalApiNetworkVip:
-    default: ''
-    type: string
-  StorageNetworkVip:
-    default: ''
-    type: string
-  StorageMgmtNetworkVip:
-    default: ''
-    type: string
-  # The following are unused in this template
-  ControlPlaneIp:
-    default: ''
-    type: string
-  ExternalIp:
-    default: ''
-    type: string
-  ExternalIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  InternalApiIp:
-    default: ''
-    type: string
-  InternalApiIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageIp:
-    default: ''
-    type: string
-  StorageIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageMgmtIp:
-    default: ''
-    type: string
-  StorageMgmtIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-
-outputs:
-  net_ip_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs
-      for a specific machine.
-    value:
-      ctlplane: {get_param: ControlPlaneIP}
-      external: {get_param: ExternalNetworkVip}
-      internal_api: {get_param: InternalApiNetworkVip}
-      storage: {get_param: StorageNetworkVip}
-      storage_mgmt: {get_param: StorageMgmtNetworkVip}
-      ctlplane_uri: {get_param: ControlPlaneIP}
-      external_uri: {get_param: ExternalNetworkVip}
-      internal_api_uri: {get_param: InternalApiNetworkVip}
-      storage_uri: {get_param: StorageNetworkVip}
-      storage_mgmt_uri: {get_param: StorageMgmtNetworkVip}
diff --git a/network/ports/net_vip_map_external_v6.j2.yaml b/network/ports/net_vip_map_external_v6.j2.yaml
new file mode 100644 (file)
index 0000000..5eff73c
--- /dev/null
@@ -0,0 +1,45 @@
+heat_template_version: pike
+
+parameters:
+  # Set these via parameter defaults to configure external VIPs
+  ControlPlaneIP:
+    default: ''
+    type: string
+{%- for network in networks if network.vip|default(false) %}
+  {{network.name}}NetworkVip:
+    default: ''
+    type: string
+{%- endfor %}
+  # The following are unused in this template
+  ControlPlaneIp:
+    default: ''
+    type: string
+{%- for network in networks if network.vip|default(false) %}
+  {{network.name}}Ip:
+    default: ''
+    type: string
+  {{network.name}}IpUri:
+    default: ''
+    type: string
+    description: IP address with brackets in case of IPv6
+{%- endfor %}
+
+outputs:
+  net_ip_map:
+    description: >
+      A Hash containing a mapping of network names to assigned IPs
+      for a specific machine.
+    value:
+      ctlplane: {get_param: ControlPlaneIP}
+{%- for network in networks if network.vip|default(false) %}
+      {{network.name_lower}}: {get_param: {{network.name}}NetworkVip}
+{%- endfor %}
+      ctlplane_uri: {get_param: ControlPlaneIP}
+{%- for network in networks if network.vip|default(false) %}
+      {{network.name_lower}}_uri:
+        list_join:
+          - ''
+          - - '['
+            - {get_param: {{network.name}}NetworkVip}
+            - ']'
+{%- endfor %}
diff --git a/network/ports/net_vip_map_external_v6.yaml b/network/ports/net_vip_map_external_v6.yaml
deleted file mode 100644 (file)
index 72e60cb..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-heat_template_version: pike
-
-parameters:
-  # Set these via parameter defaults to configure external VIPs
-  ControlPlaneIP:
-    default: ''
-    type: string
-  ExternalNetworkVip:
-    default: ''
-    type: string
-  InternalApiNetworkVip:
-    default: ''
-    type: string
-  StorageNetworkVip:
-    default: ''
-    type: string
-  StorageMgmtNetworkVip:
-    default: ''
-    type: string
-  # The following are unused in this template
-  ControlPlaneIp:
-    default: ''
-    type: string
-  ExternalIp:
-    default: ''
-    type: string
-  ExternalIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  InternalApiIp:
-    default: ''
-    type: string
-  InternalApiIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageIp:
-    default: ''
-    type: string
-  StorageIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageMgmtIp:
-    default: ''
-    type: string
-  StorageMgmtIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-
-outputs:
-  net_ip_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs
-      for a specific machine.
-    value:
-      ctlplane: {get_param: ControlPlaneIP}
-      external: {get_param: ExternalNetworkVip}
-      internal_api: {get_param: InternalApiNetworkVip}
-      storage: {get_param: StorageNetworkVip}
-      storage_mgmt: {get_param: StorageMgmtNetworkVip}
-      ctlplane_uri: {get_param: ControlPlaneIP}
-      external_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: ExternalNetworkVip}
-            - ']'
-      internal_api_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: InternalApiNetworkVip}
-            - ']'
-      storage_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: StorageNetworkVip}
-            - ']'
-      storage_mgmt_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: StorageMgmtNetworkVip}
-            - ']'
index c06c58e..0940b84 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   StorageMgmtNetName:
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     default: storage_mgmt
     type: string
   PortName:
index 07308a7..7efbc5e 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   StorageMgmtNetName:
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     default: storage_mgmt
     type: string
   PortName:
@@ -26,7 +26,7 @@ parameters:
     type: number
   StorageMgmtNetCidr:
     default: '172.16.3.0/24'
-    description: Cidr for the storage management network.
+    description: Cidr for the storage_mgmt network.
     type: string
 
 outputs:
index 1b30f0c..07998ab 100644 (file)
@@ -6,7 +6,7 @@ description: >
 
 parameters:
   StorageMgmtNetName:
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     default: storage_mgmt
     type: string
   PortName:
@@ -27,7 +27,7 @@ parameters:
     type: number
   StorageMgmtNetCidr:
     default: 'fd00:fd00:fd00:4000::/64'
-    description: Cidr for the storage management network.
+    description: Cidr for the storage_mgmt network.
     type: string
 
 outputs:
index c10b139..399590c 100644 (file)
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   StorageMgmtNetName:
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     default: storage_mgmt
     type: string
   PortName:
index ba8e556..54646c3 100644 (file)
@@ -106,7 +106,7 @@ parameters:
 
   InternalApiNetName:
     default: internal_api
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     type: string
   ExternalNetName:
     default: external
@@ -122,7 +122,7 @@ parameters:
     type: string
   StorageMgmtNetName:
     default: storage_mgmt
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     type: string
   TenantNetName:
     default: tenant
diff --git a/network/storage.yaml b/network/storage.yaml
deleted file mode 100644 (file)
index 9729044..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Storage network.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  StorageNetCidr:
-    default: '172.16.1.0/24'
-    description: Cidr for the storage network.
-    type: string
-  StorageNetValueSpecs:
-    default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
-    description: Value specs for the storage network.
-    type: json
-  StorageNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  StorageNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  StorageNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageSubnetName:
-    default: storage_subnet
-    description: The name of the storage subnet in Neutron.
-    type: string
-  StorageAllocationPools:
-    default: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
-    description: Ip allocation pool range for the storage network.
-    type: json
-
-resources:
-  StorageNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: StorageNetAdminStateUp}
-      name: {get_param: StorageNetName}
-      shared: {get_param: StorageNetShared}
-      value_specs: {get_param: StorageNetValueSpecs}
-
-  StorageSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: StorageNetCidr}
-      enable_dhcp: {get_param: StorageNetEnableDHCP}
-      name: {get_param: StorageSubnetName}
-      network: {get_resource: StorageNetwork}
-      allocation_pools: {get_param: StorageAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron storage network
-    value: {get_resource: StorageNetwork}
-  subnet_cidr:
-    value: {get_attr: [StorageSubnet, cidr]}
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
deleted file mode 100644 (file)
index fc00557..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Storage management network. Storage replication, etc.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  StorageMgmtNetCidr:
-    default: '172.16.3.0/24'
-    description: Cidr for the storage management network.
-    type: string
-  StorageMgmtNetValueSpecs:
-    default: {'provider:physical_network': 'storage_mgmt', 'provider:network_type': 'flat'}
-    description: Value specs for the storage_mgmt network.
-    type: json
-  StorageMgmtNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  StorageMgmtNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  StorageMgmtNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  StorageMgmtNetName:
-    default: storage_mgmt
-    description: The name of the Storage management network.
-    type: string
-  StorageMgmtSubnetName:
-    default: storage_mgmt_subnet
-    description: The name of the Storage management subnet in Neutron.
-    type: string
-  StorageMgmtAllocationPools:
-    default: [{'start': '172.16.3.4', 'end': '172.16.3.250'}]
-    description: Ip allocation pool range for the storage mgmt network.
-    type: json
-
-resources:
-  StorageMgmtNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: StorageMgmtNetAdminStateUp}
-      name: {get_param: StorageMgmtNetName}
-      shared: {get_param: StorageMgmtNetShared}
-      value_specs: {get_param: StorageMgmtNetValueSpecs}
-
-  StorageMgmtSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: StorageMgmtNetCidr}
-      enable_dhcp: {get_param: StorageMgmtNetEnableDHCP}
-      name: {get_param: StorageMgmtSubnetName}
-      network: {get_resource: StorageMgmtNetwork}
-      allocation_pools: {get_param: StorageMgmtAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron storage management network
-    value: {get_resource: StorageMgmtNetwork}
-  subnet_cidr:
-    value: {get_attr: [StorageMgmtSubnet, cidr]}
index cef87de..7ed4c92 100644 (file)
@@ -8,7 +8,7 @@ parameters:
   StorageMgmtNetCidr:
     # OpenStack uses the EUI-64 address format, which requires a /64 prefix
     default: 'fd00:fd00:fd00:4000::/64'
-    description: Cidr for the storage management network.
+    description: Cidr for the storage_mgmt network.
     type: string
   StorageMgmtNetValueSpecs:
     default: {'provider:physical_network': 'storage_mgmt', 'provider:network_type': 'flat'}
@@ -24,15 +24,15 @@ parameters:
     type: boolean
   StorageMgmtNetName:
     default: storage_mgmt
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     type: string
   StorageMgmtSubnetName:
     default: storage_mgmt_subnet
-    description: The name of the Storage management subnet in Neutron.
+    description: The name of the storage_mgmt subnet in Neutron.
     type: string
   StorageMgmtAllocationPools:
     default: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
-    description: Ip allocation pool range for the storage mgmt network.
+    description: Ip allocation pool range for the storage_mgmt network.
     type: json
   IPv6AddressMode:
     default: dhcpv6-stateful
diff --git a/network/tenant.yaml b/network/tenant.yaml
deleted file mode 100644 (file)
index 67c4abb..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Tenant network.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  TenantNetCidr:
-    default: '172.16.0.0/24'
-    description: Cidr for the tenant network.
-    type: string
-  TenantNetValueSpecs:
-    default: {'provider:physical_network': 'tenant', 'provider:network_type': 'flat'}
-    description: Value specs for the tenant network.
-    type: json
-  TenantNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  TenantNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  TenantNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
-    type: string
-  TenantSubnetName:
-    default: tenant_subnet
-    description: The name of the tenant subnet in Neutron.
-    type: string
-  TenantAllocationPools:
-    default: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
-    description: Ip allocation pool range for the tenant network.
-    type: json
-
-resources:
-  TenantNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: TenantNetAdminStateUp}
-      name: {get_param: TenantNetName}
-      shared: {get_param: TenantNetShared}
-      value_specs: {get_param: TenantNetValueSpecs}
-
-  TenantSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: TenantNetCidr}
-      enable_dhcp: {get_param: TenantNetEnableDHCP}
-      name: {get_param: TenantSubnetName}
-      network: {get_resource: TenantNetwork}
-      allocation_pools: {get_param: TenantAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron tenant network
-    value: {get_resource: TenantNetwork}
-  subnet_cidr:
-    value: {get_attr: [TenantSubnet, cidr]}
index 63868b5..2a9f9d7 100644 (file)
@@ -279,7 +279,6 @@ resource_registry:
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Docker: OS::Heat::None
   OS::TripleO::Services::CertmongerUser: OS::Heat::None
-  OS::TripleO::Services::Iscsid: OS::Heat::None
   OS::TripleO::Services::Clustercheck: OS::Heat::None
   OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
 
index a7a4fe2..2e39867 100644 (file)
@@ -21,40 +21,44 @@ description: >
 parameters:
 
   # Common parameters (not specific to a role)
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # Special case the External hostname param, which is CloudName
   CloudName:
     default: overcloud.localdomain
     description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
     type: string
+{%- elif network.name == 'InternalApi' %}
+  # Special case the Internal API hostname param, which is CloudNameInternal
   CloudNameInternal:
-    default: overcloud.internalapi.localdomain
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's internal API endpoint. E.g.
-      'ci-overcloud.internalapi.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
-  CloudNameStorage:
-    default: overcloud.storage.localdomain
+{%- elif network.name == 'StorageMgmt' %}
+  # Special case StorageMgmt hostname param, which is CloudNameStorageManagement
+  CloudNameStorageManagement:
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's storage endpoint. E.g.
-      'ci-overcloud.storage.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
-  CloudNameStorageManagement:
-    default: overcloud.storagemgmt.localdomain
+{%- else %}
+  CloudName{{network.name}}:
+    default: overcloud.{{network.name.lower()}}.localdomain
     description: >
-      The DNS name of this cloud's storage management endpoint. E.g.
-      'ci-overcloud.storagemgmt.tripleo.org'.
+      The DNS name of this cloud's {{network.name_lower}} endpoint. E.g.
+      'ci-overcloud.{{network.name.lower()}}.tripleo.org'.
     type: string
+{%- endif %}
+{%- endfor %}
   CloudNameCtlplane:
     default: overcloud.ctlplane.localdomain
     description: >
       The DNS name of this cloud's provisioning network endpoint. E.g.
       'ci-overcloud.ctlplane.tripleo.org'.
     type: string
-  ControlFixedIPs:
-    default: []
-    description: >
-        Control the IP allocation for the ControlVirtualIP port. E.g.
-        [{'ip_address':'1.2.3.4'}]
-    type: json
   ExtraConfig:
     default: {}
     description: |
@@ -77,12 +81,6 @@ parameters:
     description: |
       DEPRECATED use ComputeExtraConfig instead
     type: json
-  InternalApiVirtualFixedIPs:
-    default: []
-    description: >
-        Control the IP allocation for the InternalApiVirtualInterface port. E.g.
-        [{'ip_address':'1.2.3.4'}]
-    type: json
   NeutronControlPlaneID:
     default: 'ctlplane'
     type: string
@@ -91,28 +89,34 @@ parameters:
     default: nic1
     description: Which interface to add to the NeutronPhysicalBridge.
     type: string
-  PublicVirtualFixedIPs:
+  ControlFixedIPs:
     default: []
     description: >
-        Control the IP allocation for the PublicVirtualInterface port. E.g.
+        Control the IP allocation for the ControlVirtualIP port. E.g.
         [{'ip_address':'1.2.3.4'}]
     type: json
-  RabbitCookieSalt:
-    type: string
-    default: unset
-    description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
-  StorageVirtualFixedIPs:
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # TODO (dsneddon) Legacy name, eventually refactor to match network name
+  PublicVirtualFixedIPs:
     default: []
     description: >
-        Control the IP allocation for the StorageVirtualInterface port. E.g.
+        Control the IP allocation for the PublicVirtualInterface port. E.g.
         [{'ip_address':'1.2.3.4'}]
     type: json
-  StorageMgmtVirtualFixedIPs:
+{%- else %}
+  {{network.name}}VirtualFixedIPs:
     default: []
     description: >
-        Control the IP allocation for the StorageMgmgVirtualInterface port. E.g.
+        Control the IP allocation for the {{network.name}}VirtualInterface port. E.g.
         [{'ip_address':'1.2.3.4'}]
     type: json
+{%- endif %}
+{%- endfor %}
+  RabbitCookieSalt:
+    type: string
+    default: unset
+    description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
   RedisVirtualFixedIPs:
     default: []
     description: >
@@ -240,28 +244,38 @@ resources:
         - - str_replace:
               template: IP  HOST
               params:
-                IP: {get_attr: [VipMap, net_ip_map, external]}
-                HOST: {get_param: CloudName}
+                IP: {get_attr: [VipMap, net_ip_map, ctlplane]}
+                HOST: {get_param: CloudNameCtlplane}
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # Special case the External hostname param, which is CloudName
           - str_replace:
               template: IP  HOST
               params:
-                IP: {get_attr: [VipMap, net_ip_map, ctlplane]}
-                HOST: {get_param: CloudNameCtlplane}
+                IP: {get_attr: [VipMap, net_ip_map, {{network.name_lower}}]}
+                HOST: {get_param: CloudName}
+{%- elif network.name == 'InternalApi' %}
+  # Special case the Internal API hostname param, which is CloudNameInternal
           - str_replace:
               template: IP  HOST
               params:
-                IP: {get_attr: [VipMap, net_ip_map, internal_api]}
+                IP: {get_attr: [VipMap, net_ip_map, {{network.name_lower}}]}
                 HOST: {get_param: CloudNameInternal}
+{%- elif network.name == 'StorageMgmt' %}
+  # Special case StorageMgmt hostname param, which is CloudNameStorageManagement
           - str_replace:
               template: IP  HOST
               params:
-                IP: {get_attr: [VipMap, net_ip_map, storage]}
-                HOST: {get_param: CloudNameStorage}
+                IP: {get_attr: [VipMap, net_ip_map, {{network.name_lower}}]}
+                HOST: {get_param: CloudNameStorageManagement}
+{%- else %}
           - str_replace:
               template: IP  HOST
               params:
-                IP: {get_attr: [VipMap, net_ip_map, storage_mgmt]}
-                HOST: {get_param: CloudNameStorageManagement}
+                IP: {get_attr: [VipMap, net_ip_map, {{network.name_lower}}]}
+                HOST: {get_param: CloudName{{network.name}}}
+{%- endif %}
+{%- endfor %}
 
   HeatAuthEncryptionKey:
     type: OS::TripleO::RandomString
@@ -297,11 +311,21 @@ resources:
     type: OS::TripleO::EndpointMap
     properties:
       CloudEndpoints:
-        external: {get_param: CloudName}
-        internal_api: {get_param: CloudNameInternal}
-        storage: {get_param: CloudNameStorage}
-        storage_mgmt: {get_param: CloudNameStorageManagement}
         ctlplane: {get_param: CloudNameCtlplane}
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # Special case the External hostname param, which is CloudName
+        {{network.name_lower}}: {get_param: CloudName}
+{%- elif network.name == 'InternalApi' %}
+  # Special case the Internal API hostname param, which is CloudNameInternal
+        {{network.name_lower}}: {get_param: CloudNameInternal}
+{%- elif network.name == 'StorageMgmt' %}
+  # Special case StorageMgmt hostname param, which is CloudNameStorageManagement
+        {{network.name_lower}}: {get_param: CloudNameStorageManagement}
+{%- else %}
+        {{network.name_lower}}: {get_param: CloudName{{network.name}}}
+{%- endif %}
+{%- endfor %}
       NetIpMap: {get_attr: [VipMap, net_ip_map]}
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
 
@@ -458,12 +482,9 @@ resources:
     type: OS::TripleO::Network::Ports::NetIpListMap
     properties:
       ControlPlaneIpList: {get_attr: [{{role.name}}, ip_address]}
-      ExternalIpList: {get_attr: [{{role.name}}, external_ip_address]}
-      InternalApiIpList: {get_attr: [{{role.name}}, internal_api_ip_address]}
-      StorageIpList: {get_attr: [{{role.name}}, storage_ip_address]}
-      StorageMgmtIpList: {get_attr: [{{role.name}}, storage_mgmt_ip_address]}
-      TenantIpList: {get_attr: [{{role.name}}, tenant_ip_address]}
-      ManagementIpList: {get_attr: [{{role.name}}, management_ip_address]}
+{%- for network in networks if network.enabled|default(true) %}
+      {{network.name}}IpList: {get_attr: [{{role.name}}, {{network.name_lower}}_ip_address]}
+{%- endfor %}
       EnabledServices: {get_attr: [{{role.name}}ServiceNames, value]}
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}
       ServiceHostnameList: {get_attr: [{{role.name}}, hostname]}
@@ -582,10 +603,20 @@ resources:
   allNodesConfig:
     type: OS::TripleO::AllNodes::SoftwareConfig
     properties:
-      cloud_name_external: {get_param: CloudName}
-      cloud_name_internal_api: {get_param: CloudNameInternal}
-      cloud_name_storage: {get_param: CloudNameStorage}
-      cloud_name_storage_mgmt: {get_param: CloudNameStorageManagement}
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
+  # Special case the External hostname param, which is CloudName
+      cloud_name_{{network.name_lower}}: {get_param: CloudName}
+{%- elif network.name == 'InternalApi' %}
+  # Special case the Internal API hostname param, which is CloudNameInternal
+      cloud_name_{{network.name_lower}}: {get_param: CloudNameInternal}
+{%- elif network.name == 'StorageMgmt' %}
+  # Special case StorageMgmt hostname param, which is CloudNameStorageManagement
+      cloud_name_{{network.name_lower}}: {get_param: CloudNameStorageManagement}
+{%- else %}
+      cloud_name_{{network.name_lower}}: {get_param: CloudName{{network.name}}}
+{%- endif %}
+{%- endfor %}
       cloud_name_ctlplane: {get_param: CloudNameCtlplane}
       enabled_services:
         list_join:
@@ -699,6 +730,8 @@ resources:
       ServiceName: redis
       FixedIPs: {get_param: RedisVirtualFixedIPs}
 
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
   # The public VIP is on the External net, falls back to ctlplane
   PublicVirtualIP:
     depends_on: Networks
@@ -708,43 +741,38 @@ resources:
       ControlPlaneNetwork: {get_param: NeutronControlPlaneID}
       PortName: public_virtual_ip
       FixedIPs: {get_param: PublicVirtualFixedIPs}
-
-  InternalApiVirtualIP:
+{%- elif network.name == 'StorageMgmt' %}
+  {{network.name}}VirtualIP:
     depends_on: Networks
-    type: OS::TripleO::Network::Ports::InternalApiVipPort
+    type: OS::TripleO::Network::Ports::{{network.name}}VipPort
     properties:
       ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-      PortName: internal_api_virtual_ip
-      FixedIPs: {get_param: InternalApiVirtualFixedIPs}
-
-  StorageVirtualIP:
-    depends_on: Networks
-    type: OS::TripleO::Network::Ports::StorageVipPort
-    properties:
-      ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-      PortName: storage_virtual_ip
-      FixedIPs: {get_param: StorageVirtualFixedIPs}
-
-  StorageMgmtVirtualIP:
+      PortName: storage_management_virtual_ip
+      FixedIPs: {get_param: {{network.name}}VirtualFixedIPs}
+{%- else %}
+  {{network.name}}VirtualIP:
     depends_on: Networks
-    type: OS::TripleO::Network::Ports::StorageMgmtVipPort
+    type: OS::TripleO::Network::Ports::{{network.name}}VipPort
     properties:
       ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-      PortName: storage_management_virtual_ip
-      FixedIPs: {get_param: StorageMgmtVirtualFixedIPs}
+      PortName: {{network.name_lower}}_virtual_ip
+      FixedIPs: {get_param: {{network.name}}VirtualFixedIPs}
+{%- endif %}
+{%- endfor %}
 
   VipMap:
     type: OS::TripleO::Network::Ports::NetVipMap
     properties:
       ControlPlaneIp: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name == 'External' %}
       ExternalIp: {get_attr: [PublicVirtualIP, ip_address]}
       ExternalIpUri: {get_attr: [PublicVirtualIP, ip_address_uri]}
-      InternalApiIp: {get_attr: [InternalApiVirtualIP, ip_address]}
-      InternalApiIpUri: {get_attr: [InternalApiVirtualIP, ip_address_uri]}
-      StorageIp: {get_attr: [StorageVirtualIP, ip_address]}
-      StorageIpUri: {get_attr: [StorageVirtualIP, ip_address_uri]}
-      StorageMgmtIp: {get_attr: [StorageMgmtVirtualIP, ip_address]}
-      StorageMgmtIpUri: {get_attr: [StorageMgmtVirtualIP, ip_address_uri]}
+{%- else %}
+      {{network.name}}Ip: {get_attr: [{{network.name}}VirtualIP, ip_address]}
+      {{network.name}}IpUri: {get_attr: [{{network.name}}VirtualIP, ip_address_uri]}
+{%- endif %}
+{%- endfor %}
       # No tenant or management VIP required
     # Because of nested get_attr functions in the KeystoneAdminVip output, we
     # can't determine which attributes of VipMap are used until after
@@ -758,24 +786,12 @@ resources:
       PingTestIps:
         list_join:
         - ' '
-        - - yaql:
-              expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, external_ip_address]}
-          - yaql:
-              expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, internal_api_ip_address]}
-          - yaql:
-              expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, storage_ip_address]}
-          - yaql:
-              expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, storage_mgmt_ip_address]}
-          - yaql:
-              expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, tenant_ip_address]}
+        -
+{%- for network in networks if network.enabled|default(true) %}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, management_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, {{network.name_lower}}_ip_address]}
+{%- endfor %}
 
   UpdateWorkflow:
     type: OS::TripleO::Tasks::UpdateWorkflow
index 24aa152..3044fe3 100644 (file)
@@ -76,7 +76,7 @@ parameters:
 
   InternalApiNetName:
     default: internal_api
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     type: string
   ExternalNetName:
     default: external
@@ -92,7 +92,7 @@ parameters:
     type: string
   StorageMgmtNetName:
     default: storage_mgmt
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     type: string
   TenantNetName:
     default: tenant
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
deleted file mode 100644 (file)
index ce44fd6..0000000
+++ /dev/null
@@ -1,718 +0,0 @@
-heat_template_version: pike
-description: 'OpenStack ceph storage node configured by Puppet'
-parameters:
-  OvercloudCephStorageFlavor:
-    description: Flavor for the Ceph Storage node.
-    default: baremetal
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
-  CephStorageImage:
-    type: string
-    default: overcloud-full
-    constraints:
-      - custom_constraint: glance.image
-  ImageUpdatePolicy:
-    default: 'REBUILD_PRESERVE_EPHEMERAL'
-    description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
-    type: string
-  KeyName:
-    description: Name of an existing Nova key pair to enable SSH access to the instances
-    type: string
-    default: default
-    constraints:
-      - custom_constraint: nova.keypair
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  UpdateIdentifier:
-    default: ''
-    type: string
-    description: >
-      Setting to a previously unused value during stack-update will trigger
-      package update on all nodes
-  Hostname:
-    type: string
-    default: '' # Defaults to Heat created hostname
-  HostnameMap:
-    type: json
-    default: {}
-    description: Optional mapping to override hostnames
-  ExtraConfig:
-    default: {}
-    description: |
-      Additional hiera configuration to inject into the cluster. Note
-      that CephStorageExtraConfig takes precedence over ExtraConfig.
-    type: json
-  CephStorageExtraConfig:
-    default: {}
-    description: |
-      Role specific additional hiera configuration to inject into the cluster.
-    type: json
-  CephStorageIPs:
-    default: {}
-    type: json
-  NetworkDeploymentActions:
-    type: comma_delimited_list
-    description: >
-      Heat action when to apply network configuration changes
-    default: ['CREATE']
-  SoftwareConfigTransport:
-    default: POLL_SERVER_CFN
-    description: |
-      How the server should receive the metadata required for software configuration.
-    type: string
-    constraints:
-    - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
-  CloudDomain:
-    default: 'localdomain'
-    type: string
-    description: >
-      The DNS domain used for the hosts. This must match the
-      overcloud_domain_name configured on the undercloud.
-  CephStorageServerMetadata:
-    default: {}
-    description: >
-      Extra properties or metadata passed to Nova for the created nodes in
-      the overcloud. It's accessible via the Nova metadata API. This option is
-      role-specific and is merged with the values given to the ServerMetadata
-      parameter.
-    type: json
-  ServerMetadata:
-    default: {}
-    description: >
-      Extra properties or metadata passed to Nova for the created nodes in
-      the overcloud. It's accessible via the Nova metadata API. This applies to
-      all roles and is merged with a role-specific metadata parameter.
-    type: json
-  CephStorageSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
-  NodeIndex:
-    type: number
-    default: 0
-  ServiceConfigSettings:
-    type: json
-    default: {}
-  ServiceNames:
-    type: comma_delimited_list
-    default: []
-  MonitoringSubscriptions:
-    type: comma_delimited_list
-    default: []
-  ServiceMetadataSettings:
-    type: json
-    default: {}
-  ConfigCommand:
-    type: string
-    description: Command which will be run whenever configuration data changes
-    default: os-refresh-config --timeout 14400
-  ConfigCollectSplay:
-    type: number
-    default: 30
-    description: |
-      Maximum amount of time to possibly to delay configuation collection
-      polling. Defaults to 30 seconds. Set to 0 to disable it which will cause
-      the configuration collection to occur as soon as the collection process
-      starts.  This setting is used to prevent the configuration collection
-      processes from polling all at the exact same time.
-  UpgradeInitCommand:
-    type: string
-    description: |
-      Command or script snippet to run on all overcloud nodes to
-      initialize the upgrade process. E.g. a repository switch.
-    default: ''
-  UpgradeInitCommonCommand:
-    type: string
-    description: |
-      Common commands required by the upgrades process. This should not
-      normally be modified by the operator and is set and unset in the
-      major-upgrade-composable-steps.yaml and major-upgrade-converge.yaml
-      environment files.
-    default: ''
-  DeploymentServerBlacklistDict:
-    default: {}
-    type: json
-    description: >
-      Map of server hostnames to blacklist from any triggered
-      deployments. If the value is 1, the server will be blacklisted. This
-      parameter is generated from the parent template.
-  RoleParameters:
-    type: json
-    description: Parameters specific to the role
-    default: {}
-  DeploymentSwiftDataMap:
-    type: json
-    description: |
-      Map of servers to Swift container and object for storing deployment data.
-      The keys are the Heat assigned hostnames, and the value is a map of the
-      container/object name in Swift. Example value:
-        overcloud-controller-0:
-          container: overcloud-controller
-          object: 0
-        overcloud-controller-1:
-          container: overcloud-controller
-          object: 1
-        overcloud-controller-2:
-          container: overcloud-controller
-          object: 2
-        overcloud-novacompute-0:
-          container: overcloud-compute
-          object: 0
-    default: {}
-
-conditions:
-  server_not_blacklisted:
-    not:
-      equals:
-        - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
-        - 1
-  deployment_swift_data_map_unset:
-    equals:
-      - get_param:
-          - DeploymentSwiftDataMap
-          - {get_param: Hostname}
-      - ""
-
-resources:
-  CephStorage:
-    type: OS::TripleO::CephStorageServer
-    metadata:
-      os-collect-config:
-        command: {get_param: ConfigCommand}
-        splay: {get_param: ConfigCollectSplay}
-    properties:
-      image: {get_param: CephStorageImage}
-      image_update_policy: {get_param: ImageUpdatePolicy}
-      flavor: {get_param: OvercloudCephStorageFlavor}
-      key_name: {get_param: KeyName}
-      networks:
-        - network: ctlplane
-      user_data_format: SOFTWARE_CONFIG
-      user_data: {get_resource: UserData}
-      name:
-        str_replace:
-            template: {get_param: Hostname}
-            params: {get_param: HostnameMap}
-      software_config_transport: {get_param: SoftwareConfigTransport}
-      metadata:
-        map_merge:
-          - {get_param: ServerMetadata}
-          - {get_param: CephStorageServerMetadata}
-          - {get_param: ServiceMetadataSettings}
-      scheduler_hints: {get_param: CephStorageSchedulerHints}
-      deployment_swift_data:
-        if:
-          - deployment_swift_data_map_unset
-          - {}
-          - {get_param: [DeploymentSwiftDataMap,
-                         {get_param: Hostname}]}
-
-  # Combine the NodeAdminUserData and NodeUserData mime archives
-  UserData:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: {get_resource: NodeAdminUserData}
-        type: multipart
-      - config: {get_resource: NodeUserData}
-        type: multipart
-      - config: {get_resource: RoleUserData}
-        type: multipart
-
-  # Creates the "heat-admin" user if configured via the environment
-  # Should return a OS::Heat::MultipartMime reference via OS::stack_id
-  NodeAdminUserData:
-    type: OS::TripleO::NodeAdminUserData
-
-  # For optional operator additional userdata
-  # Should return a OS::Heat::MultipartMime reference via OS::stack_id
-  NodeUserData:
-    type: OS::TripleO::NodeUserData
-
-  # For optional operator role-specific userdata
-  # Should return a OS::Heat::MultipartMime reference via OS::stack_id
-  RoleUserData:
-    type: OS::TripleO::CephStorage::NodeUserData
-
-  ExternalPort:
-    type: OS::TripleO::CephStorage::Ports::ExternalPort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  InternalApiPort:
-    type: OS::TripleO::CephStorage::Ports::InternalApiPort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  StoragePort:
-    type: OS::TripleO::CephStorage::Ports::StoragePort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  StorageMgmtPort:
-    type: OS::TripleO::CephStorage::Ports::StorageMgmtPort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  TenantPort:
-    type: OS::TripleO::CephStorage::Ports::TenantPort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  ManagementPort:
-    type: OS::TripleO::CephStorage::Ports::ManagementPort
-    properties:
-      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      IPPool: {get_param: CephStorageIPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  NetworkConfig:
-    type: OS::TripleO::CephStorage::Net::SoftwareConfig
-    properties:
-      ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
-      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
-      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
-      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
-      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
-      ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
-
-  NetIpMap:
-    type: OS::TripleO::Network::Ports::NetIpMap
-    properties:
-      ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]}
-      ExternalIp: {get_attr: [ExternalPort, ip_address]}
-      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
-      ExternalIpUri: {get_attr: [ExternalPort, ip_address_uri]}
-      InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
-      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
-      InternalApiIpUri: {get_attr: [InternalApiPort, ip_address_uri]}
-      StorageIp: {get_attr: [StoragePort, ip_address]}
-      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
-      StorageIpUri: {get_attr: [StoragePort, ip_address_uri]}
-      StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
-      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
-      StorageMgmtIpUri: {get_attr: [StorageMgmtPort, ip_address_uri]}
-      TenantIp: {get_attr: [TenantPort, ip_address]}
-      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
-      TenantIpUri: {get_attr: [TenantPort, ip_address_uri]}
-      ManagementIp: {get_attr: [ManagementPort, ip_address]}
-      ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
-      ManagementIpUri: {get_attr: [ManagementPort, ip_address_uri]}
-
-  NetHostMap:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-        external:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - external
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - external
-        internal_api:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - internalapi
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - internalapi
-        storage:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - storage
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - storage
-        storage_mgmt:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - storagemgmt
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - storagemgmt
-        tenant:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - tenant
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - tenant
-        management:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - management
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - management
-        ctlplane:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - ctlplane
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [CephStorage, name]}
-              - ctlplane
-
-  PreNetworkConfig:
-    type: OS::TripleO::CephStorage::PreNetworkConfig
-    properties:
-      server: {get_resource: CephStorage}
-      RoleParameters: {get_param: RoleParameters}
-      ServiceNames: {get_param: ServiceNames}
-      deployment_actions: {get_attr: [DeploymentActions, value]}
-
-  NetworkDeployment:
-    type: OS::TripleO::SoftwareDeployment
-    depends_on: PreNetworkConfig
-    properties:
-      name: NetworkDeployment
-      config: {get_resource: NetworkConfig}
-      server: {get_resource: CephStorage}
-      actions:
-        if:
-          - server_not_blacklisted
-          - {get_param: NetworkDeploymentActions}
-          - []
-
-  CephStorageUpgradeInitConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config:
-        list_join:
-        - ''
-        - - "#!/bin/bash\n\n"
-          - "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n"
-          - get_param: UpgradeInitCommand
-          - get_param: UpgradeInitCommonCommand
-
-  # Note we may be able to make this conditional on UpgradeInitCommandNotEmpty
-  # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
-  CephStorageUpgradeInitDeployment:
-    type: OS::Heat::SoftwareDeployment
-    depends_on: NetworkDeployment
-    properties:
-      name: CephStorageUpgradeInitDeployment
-      server: {get_resource: CephStorage}
-      config: {get_resource: CephStorageUpgradeInitConfig}
-      actions:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
-  CephStorageDeployment:
-    type: OS::Heat::StructuredDeployment
-    depends_on: CephStorageUpgradeInitDeployment
-    properties:
-      name: CephStorageDeployment
-      config: {get_resource: CephStorageConfig}
-      server: {get_resource: CephStorage}
-      input_values:
-        enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
-      actions:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
-  CephStorageConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: hiera
-      config:
-        hierarchy:
-          - '"%{::uuid}"'
-          - heat_config_%{::deploy_config_name}
-          - config_step
-          - ceph_extraconfig
-          - extraconfig
-          - service_names
-          - service_configs
-          - ceph
-          - bootstrap_node # provided by allNodesConfig
-          - all_nodes # provided by allNodesConfig
-          - vip_data # provided by allNodesConfig
-          - '"%{::osfamily}"'
-        merge_behavior: deeper
-        datafiles:
-          service_names:
-            service_names: {get_param: ServiceNames}
-            sensu::subscriptions: {get_param: MonitoringSubscriptions}
-          service_configs:
-            map_replace:
-              - {get_param: ServiceConfigSettings}
-              - values: {get_attr: [NetIpMap, net_ip_map]}
-          ceph_extraconfig: {get_param: CephStorageExtraConfig}
-          extraconfig: {get_param: ExtraConfig}
-          ceph:
-            tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
-            fqdn_internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
-            fqdn_storage: {get_attr: [NetHostMap, value, storage, fqdn]}
-            fqdn_storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
-            fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
-            fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
-            fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
-            fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
-
-  # Resource for site-specific injection of root certificate
-  NodeTLSCAData:
-    depends_on: CephStorageDeployment
-    type: OS::TripleO::NodeTLSCAData
-    properties:
-      server: {get_resource: CephStorage}
-
-  # Hook for site-specific additional pre-deployment config, e.g extra hieradata
-  CephStorageExtraConfigPre:
-    depends_on: CephStorageDeployment
-    type: OS::TripleO::CephStorageExtraConfigPre
-    # We have to use conditions here so that we don't break backwards
-    # compatibility with templates everywhere
-    condition: server_not_blacklisted
-    properties:
-        server: {get_resource: CephStorage}
-
-  # Hook for site-specific additional pre-deployment config,
-  # applying to all nodes, e.g node registration/unregistration
-  NodeExtraConfig:
-    depends_on: [CephStorageExtraConfigPre, NodeTLSCAData]
-    type: OS::TripleO::NodeExtraConfig
-    # We have to use conditions here so that we don't break backwards
-    # compatibility with templates everywhere
-    condition: server_not_blacklisted
-    properties:
-        server: {get_resource: CephStorage}
-
-  UpdateConfig:
-    type: OS::TripleO::Tasks::PackageUpdate
-
-  UpdateDeployment:
-    type: OS::Heat::SoftwareDeployment
-    depends_on: NetworkDeployment
-    properties:
-      config: {get_resource: UpdateConfig}
-      server: {get_resource: CephStorage}
-      input_values:
-        update_identifier:
-          get_param: UpdateIdentifier
-      actions:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
-  DeploymentActions:
-    type: OS::Heat::Value
-    properties:
-      value:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
-  SshHostPubKey:
-    type: OS::TripleO::Ssh::HostPubKey
-    depends_on: CephStorageDeployment
-    properties:
-        server: {get_resource: CephStorage}
-        deployment_actions: {get_attr: [DeploymentActions, value]}
-
-outputs:
-  ip_address:
-    description: IP address of the server in the ctlplane network
-    value: {get_attr: [CephStorage, networks, ctlplane, 0]}
-  hostname:
-    description: Hostname of the server
-    value: {get_attr: [CephStorage, name]}
-  hostname_map:
-    description: Mapping of network names to hostnames
-    value:
-      external: {get_attr: [NetHostMap, value, external, fqdn]}
-      internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
-      storage: {get_attr: [NetHostMap, value, storage, fqdn]}
-      storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
-      tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
-      management: {get_attr: [NetHostMap, value, management, fqdn]}
-      ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
-  hosts_entry:
-    value:
-      str_replace:
-        template: |
-          PRIMARYIP PRIMARYHOST.DOMAIN PRIMARYHOST
-          EXTERNALIP EXTERNALHOST.DOMAIN EXTERNALHOST
-          INTERNAL_APIIP INTERNAL_APIHOST.DOMAIN INTERNAL_APIHOST
-          STORAGEIP STORAGEHOST.DOMAIN STORAGEHOST
-          STORAGE_MGMTIP STORAGE_MGMTHOST.DOMAIN STORAGE_MGMTHOST
-          TENANTIP TENANTHOST.DOMAIN TENANTHOST
-          MANAGEMENTIP MANAGEMENTHOST.DOMAIN MANAGEMENTHOST
-          CTLPLANEIP CTLPLANEHOST.DOMAIN CTLPLANEHOST
-        params:
-          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
-          DOMAIN: {get_param: CloudDomain}
-          PRIMARYHOST: {get_attr: [CephStorage, name]}
-          EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
-          EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
-          INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
-          INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
-          STORAGEIP: {get_attr: [StoragePort, ip_address]}
-          STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
-          STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
-          STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
-          TENANTIP: {get_attr: [TenantPort, ip_address]}
-          TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
-          MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
-          MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
-          CTLPLANEIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-          CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
-  known_hosts_entry:
-    description: Entry for ssh known hosts
-    value:
-      str_replace:
-        template: "PRIMARYIP,PRIMARYHOST.DOMAIN,PRIMARYHOST,\
-EXTERNALIP,EXTERNALHOST.DOMAIN,EXTERNALHOST,\
-INTERNAL_APIIP,INTERNAL_APIHOST.DOMAIN,INTERNAL_APIHOST,\
-STORAGEIP,STORAGEHOST.DOMAIN,STORAGEHOST,\
-STORAGE_MGMTIP,STORAGE_MGMTHOST.DOMAIN,STORAGE_MGMTHOST,\
-TENANTIP,TENANTHOST.DOMAIN,TENANTHOST,\
-MANAGEMENTIP,MANAGEMENTHOST.DOMAIN,MANAGEMENTHOST,\
-CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST HOSTSSHPUBKEY"
-        params:
-          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
-          DOMAIN: {get_param: CloudDomain}
-          PRIMARYHOST: {get_attr: [CephStorage, name]}
-          EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
-          EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
-          INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
-          INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
-          STORAGEIP: {get_attr: [StoragePort, ip_address]}
-          STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
-          STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
-          STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
-          TENANTIP: {get_attr: [TenantPort, ip_address]}
-          TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
-          MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
-          MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
-          CTLPLANEIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
-          CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
-          HOSTSSHPUBKEY: {get_attr: [SshHostPubKey, ecdsa]}
-  nova_server_resource:
-    description: Heat resource handle for the ceph storage server
-    value:
-      {get_resource: CephStorage}
-    condition: server_not_blacklisted
-  external_ip_address:
-    description: IP address of the server in the external network
-    value: {get_attr: [ExternalPort, ip_address]}
-  internal_api_ip_address:
-    description: IP address of the server in the internal_api network
-    value: {get_attr: [InternalApiPort, ip_address]}
-  storage_ip_address:
-    description: IP address of the server in the storage network
-    value: {get_attr: [StoragePort, ip_address]}
-  storage_mgmt_ip_address:
-    description: IP address of the server in the storage_mgmt network
-    value: {get_attr: [StorageMgmtPort, ip_address]}
-  tenant_ip_address:
-    description: IP address of the server in the tenant network
-    value: {get_attr: [TenantPort, ip_address]}
-  management_ip_address:
-    description: IP address of the server in the management network
-    value: {get_attr: [ManagementPort, ip_address]}
-  deployed_server_port_map:
-    description: |
-      Map of Heat created hostname of the server to ip address. This is the
-      hostname before it has been mapped with the HostnameMap parameter, and
-      the IP address from the ctlplane network. This map can be used to construct
-      the DeployedServerPortMap parameter when using split-stack.
-    value:
-      map_replace:
-        - hostname:
-            fixed_ips:
-              - ip_address: {get_attr: [CephStorage, networks, ctlplane, 0]}
-        - keys:
-            hostname:
-              list_join:
-                - '-'
-                - - {get_param: Hostname}
-                  - ctlplane
-  deployed_server_deployment_swift_data_map:
-    description:
-      Map of Heat created hostname of the server to the Swift container and object
-      used to created the temporary url for metadata polling with
-      os-collect-config.
-    value:
-      map_replace:
-        - hostname:
-            container:
-              str_split:
-                - '/'
-                - {get_attr: [CephStorage, os_collect_config, request, metadata_url]}
-                - 5
-            object:
-              str_split:
-                - '?'
-                - str_split:
-                    - '/'
-                    - {get_attr: [CephStorage, os_collect_config, request, metadata_url]}
-                    - 6
-                - 0
-        - keys: {hostname: {get_param: Hostname}}
-  os_collect_config:
-    description: The os-collect-config configuration associated with this server resource
-    value: {get_attr: [CephStorage, os_collect_config]}
index bc91374..1ea6b1a 100644 (file)
@@ -76,6 +76,12 @@ parameters:
     description: Firewall driver for realizing neutron security group function
     type: string
     default: 'openvswitch'
+  NeutronOverlayIPVersion:
+    default: 4
+    description: IP version used for all overlay network endpoints.
+    type: number
+    constraints:
+    - allowed_values: [4,6]
 resources:
 
   NeutronBase:
@@ -105,6 +111,7 @@ outputs:
             neutron::plugins::ml2::vni_ranges: {get_param: NeutronVniRanges}
             neutron::plugins::ml2::tenant_network_types: {get_param: NeutronNetworkType}
             neutron::plugins::ml2::firewall_driver: {get_param: NeutronFirewallDriver}
+            neutron::plugins::ml2::overlay_ip_version: {get_param: NeutronOverlayIPVersion}
 
       step_config: |
         include ::tripleo::profile::base::neutron::plugins::ml2
index 7651178..47ca614 100644 (file)
@@ -35,6 +35,11 @@ parameters:
     description: The authkey for the pacemaker remote service.
     hidden: true
     default: ''
+  PcsdPassword:
+    type: string
+    description: The password for the 'pcsd' user for pacemaker.
+    hidden: true
+    default: ''
   MonitoringSubscriptionPacemakerRemote:
     default: 'overcloud-pacemaker_remote'
     type: string
@@ -103,5 +108,13 @@ outputs:
         tripleo::fencing::config: {get_param: FencingConfig}
         enable_fencing: {get_param: EnableFencing}
         tripleo::profile::base::pacemaker_remote::remote_authkey: {get_param: PacemakerRemoteAuthkey}
+        pacemaker::corosync::manage_fw: false
+        hacluster_pwd:
+          yaql:
+            expression: $.data.passwords.where($ != '').first()
+            data:
+              passwords:
+                - {get_param: PcsdPassword}
+                - {get_param: [DefaultPasswords, pcsd_password]}
       step_config: |
         include ::tripleo::profile::base::pacemaker_remote
diff --git a/releasenotes/notes/deprecate-management-envs-bbc7fddb0ca871af.yaml b/releasenotes/notes/deprecate-management-envs-bbc7fddb0ca871af.yaml
new file mode 100644 (file)
index 0000000..764686f
--- /dev/null
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Both environments/network-management.yaml and environments/network-management-v6.yaml
+    are now deprecated in favor of specifying the needed networks on each role.
diff --git a/releasenotes/notes/dont-unregister-on-delete-9708f7cbc73a0d2f.yaml b/releasenotes/notes/dont-unregister-on-delete-9708f7cbc73a0d2f.yaml
new file mode 100644 (file)
index 0000000..96e6234
--- /dev/null
@@ -0,0 +1,8 @@
+---
+fixes:
+  - Don't unregister systems from the portal/satellite
+    when deleting from Heat. There are several reasons why
+    it's compelling to fix this behavior. See
+    https://bugs.launchpad.net/tripleo/+bug/1710144
+    for full information. The previous behavior can be triggered
+    by setting the DeleteOnRHELUnregistration parameter to "true".
diff --git a/releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml b/releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml
new file mode 100644 (file)
index 0000000..e417f5f
--- /dev/null
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fix Heat condition for RHEL registration yum update
+    There were 2 problems with this condition making the
+    rhel-registration.yaml template broken: "conditions" should be "condition"
+    and the condition should refer to just a condition name defined in the
+    "conditions:" section of the template.  See
+    https://bugs.launchpad.net/tripleo/+bug/1709916
diff --git a/releasenotes/notes/neutron-ml2-overlay-ip-version-4f14932355847aa0.yaml b/releasenotes/notes/neutron-ml2-overlay-ip-version-4f14932355847aa0.yaml
new file mode 100644 (file)
index 0000000..1c20b26
--- /dev/null
@@ -0,0 +1,5 @@
+---
+features:
+  - Add NeutronOverlayIPVersion parameter to congfigure neutron ML2
+    overlay_ip_version option. This parameter should be set to 6 when user
+    requires tenant vxlan tunnel endpoints to be IPv6.
index 876dd85..f146939 100755 (executable)
@@ -50,7 +50,7 @@ _PRIVATE_OVERRIDES = ['server', 'servers', 'NodeIndex', 'DefaultPasswords']
 # static.  This allows us to generate sample environments using them when
 # necessary, but they won't be improperly included by accident.
 _HIDDEN_PARAMS = ['EndpointMap', 'RoleName', 'RoleParameters',
-                  'ServiceNetMap',
+                  'ServiceNetMap', 'ServiceData',
                   ]