Merge "Fixes missing type for heat param TenantNetName" into stable/pike

diff --git a/ci/common/net-config-multinode-os-net-config.yaml b/ci/common/net-config-multinode-os-net-config.yaml
index 9d45a9f..316862e 100644 (file)
--- a/ci/common/net-config-multinode-os-net-config.yaml
+++ b/ci/common/net-config-multinode-os-net-config.yaml
@@ -56,14 +56,14 @@ resources:
             function network_config_hook {
               primary_private_ip=$(cat /etc/nodepool/primary_node_private)
               sed -i "s/primary_private_ip/$primary_private_ip/" /etc/os-net-config/config.json
-              subnode_private_ip=$(cat /etc/nodepool/node_private)
+              subnode_private_ip=$(cat /etc/nodepool/sub_nodes_private)
               sed -i "s/subnode_private_ip/$subnode_private_ip/" /etc/os-net-config/config.json
               # We start with an arbitrarily high vni key so that we don't
               # overlap with Neutron created values. These will also match the
               # values that we've been using previously from the devstack-gate
               # code.
               vni=1000002
-              subnode_index=$(grep -n $(cat /etc/nodepool/node_private) /etc/nodepool/sub_nodes_private | cut -d: -f1)
+              subnode_index=$(grep -n $(cat /etc/nodepool/sub_nodes_private) /etc/nodepool/sub_nodes_private | cut -d: -f1)
               let vni+=$subnode_index
               sed -i "s/vni/$vni/" /etc/os-net-config/config.json
               export interface_name="br-ex_$primary_private_ip"

diff --git a/environments/nova-nuage-config.yaml b/environments/nova-nuage-config.yaml
index 5e75ed9..e8e3aaa 100644 (file)
--- a/environments/nova-nuage-config.yaml
+++ b/environments/nova-nuage-config.yaml
@@ -1,8 +1,7 @@
 # A Heat environment file which can be used to enable
 # Nuage backend on the compute, configured via puppet
 resource_registry:
-  OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::TripleO::Services::ComputeNeutronCorePluginNuage
 
 parameter_defaults:
   NuageActiveController: '0.0.0.0'

diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml
index 3b3ddc1..d1bd2d2 100644 (file)
--- a/environments/ssl/tls-endpoints-public-dns.yaml
+++ b/environments/ssl/tls-endpoints-public-dns.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-    PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+    PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}

diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml
index bca6a89..b776f64 100644 (file)
--- a/environments/ssl/tls-endpoints-public-ip.yaml
+++ b/environments/ssl/tls-endpoints-public-ip.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
-    PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'IP_ADDRESS'}
+    PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}

diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml
index e3fe608..e0cfc9e 100644 (file)
--- a/environments/ssl/tls-everywhere-endpoints-dns.yaml
+++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-    PankoAdmin: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-    PankoInternal: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+    PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+    PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
     SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}

diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index 48c509d..1a17004 100644 (file)
--- a/network/networks.j2.yaml
+++ b/network/networks.j2.yaml
@@ -4,8 +4,7 @@ description: Create networks to split out Overcloud traffic
 
 resources:
   {%- for network in networks %}
-  {%- set network_name = network.compat_name|default(network.name) %}
-  {{network_name}}Network:
+  {{network.name}}Network:
     type: OS::TripleO::Network::{{network.name}}
   {%- endfor %}
 
@@ -19,9 +18,8 @@ outputs:
       # NOTE(gfidente): we need to replace the null value with a
       # string to work around https://bugs.launchpad.net/heat/+bug/1700025
       {%- for network in networks %}
-      {%- set network_name = network.compat_name|default(network.name) %}
       {{network.name_lower}}:
         yaql:
-          data: {get_attr: [{{network_name}}Network, subnet_cidr]}
+          data: {get_attr: [{{network.name}}Network, subnet_cidr]}
           expression: str($.data).replace('null', 'disabled')
       {%- endfor %}

diff --git a/network_data.yaml b/network_data.yaml
index bce82cb..90293ab 100644 (file)
--- a/network_data.yaml
+++ b/network_data.yaml
@@ -58,7 +58,6 @@
   allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
   ipv6_subnet: 'fd00:fd00:fd00:2000::/64'
   ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
-  compat_name: Internal
 - name: Storage
   vip: true
   name_lower: storage

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index e5ae527..c8bdf9e 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -152,6 +152,7 @@ resource_registry:
   # can be the same as NeutronCorePlugin but some vendors install different
   # things where VMs run
   OS::TripleO::Services::ComputeNeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::ComputeNeutronCorePluginNuage: puppet/services/neutron-compute-plugin-nuage.yaml
   # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
   OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::NeutronCorePluginPlumgrid: puppet/services/neutron-plugin-plumgrid.yaml

diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
deleted file mode 100644 (file)
index ea2fd71..0000000
--- a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-heat_template_version: pike
-
-description: Configure hieradata for Nuage configuration on the Compute
-
-parameters:
-  server:
-    description: ID of the compute node to apply this config to
-    type: string
-
-  NuageActiveController:
-    description: IP address of the Active Virtualized Services Controller (VSC)
-    type: string
-  NuageStandbyController:
-    description: IP address of the Standby Virtualized Services Controller (VSC)
-    type: string
-  NuageMetadataPort:
-    description: TCP Port to listen for metadata server requests
-    type: string
-    default: '9697'
-  NuageNovaMetadataPort:
-    description: TCP Port used by Nova metadata server
-    type: string
-    default: '8775'
-  NuageMetadataProxySharedSecret:
-    description: Shared secret to sign the instance-id request
-    type: string
-  NuageNovaClientVersion:
-    description: Client Version Nova
-    type: string
-    default: '2'
-  NuageNovaOsUsername:
-    description: Nova username in keystone_authtoken
-    type: string
-    default: 'nova'
-  NuageMetadataAgentStartWithOvs:
-    description: Set to True if nuage-metadata-agent needs to be started with nuage-openvswitch-switch
-    type: string
-    default: 'True'
-  NuageNovaApiEndpoint:
-    description: One of publicURL, internalURL, adminURL in "keystone endpoint-list"
-    type: string
-    default: 'publicURL'
-  NuageNovaRegionName:
-    description: Region name in "keystone endpoint-list"
-    type: string
-    default: 'regionOne'
-
-# Declaration of resources for the template.
-resources:
-  NovaNuageConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: hiera
-      config:
-        datafiles:
-          nova_nuage_data:
-            mapped_data:
-             nuage::vrs::active_controller: {get_input: ActiveController}
-             nuage::vrs::standby_controller: {get_input: StandbyController}
-             nuage::metadataagent::metadata_port: {get_input: MetadataPort}
-             nuage::metadataagent::nova_metadata_port: {get_input: NovaMetadataPort}
-             nuage::metadataagent::metadata_secret: {get_input: SharedSecret}
-             nuage::metadataagent::nova_client_version: {get_input: NovaClientVersion}
-             nuage::metadataagent::nova_os_username: {get_input: NovaOsUsername}
-             nuage::metadataagent::metadata_agent_start_with_ovs: {get_input: MetadataAgentStartWithOvs}
-             nuage::metadataagent::nova_api_endpoint_type: {get_input: NovaApiEndpointType}
-             nuage::metadataagent::nova_region_name: {get_input: NovaRegionName}
-
-  NovaNuageDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      name: NovaNuageDeployment
-      config: {get_resource: NovaNuageConfig}
-      server: {get_param: server}
-      input_values:
-        ActiveController: {get_param: NuageActiveController}
-        StandbyController: {get_param: NuageStandbyController}
-        MetadataPort: {get_param: NuageMetadataPort}
-        NovaMetadataPort: {get_param: NuageNovaMetadataPort}
-        SharedSecret: {get_param: NuageMetadataProxySharedSecret}
-        NovaClientVersion: {get_param: NuageNovaClientVersion}
-        NovaOsUsername: {get_param: NuageNovaOsUsername}
-        MetadataAgentStartWithOvs: {get_param: NuageMetadataAgentStartWithOvs}
-        NovaApiEndpointType: {get_param: NuageNovaApiEndpoint}
-        NovaRegionName: {get_param: NuageNovaRegionName}
-
-# Specify output parameters that will be available
-# after the template is instantiated.
-outputs:
-  deploy_stdout:
-    description: Deployment reference, used to trigger puppet apply on changes
-    value: {get_attr: [NovaNuageDeployment, deploy_stdout]}

diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 011ec03..1c2da40 100644 (file)
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -60,6 +60,11 @@ parameters:
                  ARP cache. The garbage collector will always run if there
                  are more than this number of entries in the cache.
     type: number
+  InotifyIntancesMax:
+    default: 1024
+    description: Configures sysctl fs.inotify.max_user_instances key
+    type: number
+
 
 outputs:
   role_data:
@@ -129,5 +134,9 @@ outputs:
             value: {get_param: NeighbourGcThreshold2}
           net.ipv4.neigh.default.gc_thresh3:
             value: {get_param: NeighbourGcThreshold3}
+          # set inotify value for neutron/dnsmasq scale
+          fs.inotify.max_user_instances:
+            value: {get_param: InotifyIntancesMax}
+
       step_config: |
         include ::tripleo::profile::base::kernel

diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml
index f1a5653..e594c2d 100644 (file)
--- a/puppet/services/neutron-compute-plugin-nuage.yaml
+++ b/puppet/services/neutron-compute-plugin-nuage.yaml
@@ -38,6 +38,39 @@ parameters:
     description: TCP Port to listen for metadata server requests
     type: string
     default: '9697'
+  NuageActiveController:
+    description: IP address of the Active Virtualized Services Controller (VSC)
+    type: string
+  NuageStandbyController:
+    description: IP address of the Standby Virtualized Services Controller (VSC)
+    type: string
+  NuageNovaMetadataPort:
+    description: TCP Port used by Nova metadata server
+    type: string
+    default: '8775'
+  NuageMetadataProxySharedSecret:
+    description: Shared secret to sign the instance-id request
+    type: string
+  NuageNovaClientVersion:
+    description: Client Version Nova
+    type: string
+    default: '2'
+  NuageNovaOsUsername:
+    description: Nova username in keystone_authtoken
+    type: string
+    default: 'nova'
+  NuageMetadataAgentStartWithOvs:
+    description: Set to True if nuage-metadata-agent needs to be started with nuage-openvswitch-switch
+    type: string
+    default: 'True'
+  NuageNovaApiEndpoint:
+    description: One of publicURL, internalURL, adminURL in "keystone endpoint-list"
+    type: string
+    default: 'publicURL'
+  NuageNovaRegionName:
+    description: Region name in "keystone endpoint-list"
+    type: string
+    default: 'regionOne'
 
 outputs:
   role_data:
@@ -45,6 +78,16 @@ outputs:
     value:
       service_name: neutron_compute_plugin_nuage
       config_settings:
+        nuage::vrs::active_controller: {get_param: NuageActiveController}
+        nuage::vrs::standby_controller: {get_param: NuageStandbyController}
+        nuage::metadataagent::metadata_port: {get_param: NuageMetadataPort}
+        nuage::metadataagent::nova_metadata_port: {get_param: NuageNovaMetadataPort}
+        nuage::metadataagent::metadata_secret: {get_param: NuageMetadataProxySharedSecret}
+        nuage::metadataagent::nova_client_version: {get_param: NuageNovaClientVersion}
+        nuage::metadataagent::nova_os_username: {get_param: NuageNovaOsUsername}
+        nuage::metadataagent::metadata_agent_start_with_ovs: {get_param: NuageMetadataAgentStartWithOvs}
+        nuage::metadataagent::nova_api_endpoint_type: {get_param: NuageNovaApiEndpoint}
+        nuage::metadataagent::nova_region_name: {get_param: NuageNovaRegionName}
         tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service'
         tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword}
         tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]}

diff --git a/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml b/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml
new file mode 100644 (file)
index 0000000..2e7e79f
--- /dev/null
+++ b/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes heat resource OS::TripleO::Network::Internal to be renamed back to
+    OS::TripleO::Network::InternalApi for backwards compatibility with
+    previous versions.

diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 43a1afc..a3b5f24 100644 (file)
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -172,9 +172,9 @@ environments:
             OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
-            PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'IP_ADDRESS'}
+            PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
@@ -273,9 +273,9 @@ environments:
             OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-            PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+            PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
@@ -374,9 +374,9 @@ environments:
             OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-            PankoAdmin: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-            PankoInternal: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+            PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+            PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
             SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}