Contrail network realignement + DPDK enablement

This patch moves Contrail roles communication from public/external
to internal_api network for OpenStack API.
It also adds the option to enable dpdk.
Monolithic firstboot script is broken down into small pre-network
and per-node extraconfig scripts

Change-Id: I296a3bf60cef6fa950fd71d6e68effe367d1e66b
Closes-Bug: 1698422

1 files changed, 66 insertions, 30 deletions

diff --git a/puppet/services/network/contrail-base.yaml b/puppet/services/network/contrail-base.yaml
index 9ee8a651..5e04a25b 100644
--- a/puppet/services/network/contrail-base.yaml
+++ b/puppet/services/network/contrail-base.yaml
@@ -30,11 +30,11 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  ContrailAAAMode:
+  AAAMode:
     description: AAAmode can be no-auth, cloud-admin or rbac
     type: string
     default: 'rbac'
-  ContrailAAAModeAnalytics:
+  AAAModeAnalytics:
     description: AAAmode for analytics can be no-auth, cloud-admin or rbac
     type: string
     default: 'no-auth'
@@ -54,18 +54,26 @@ parameters:
     description: Keystone admin user name
     type: string
     default: 'admin'
-  AuthPortSSL:
-    default: 13357
-    description: Keystone SSL port
-    type: number
-  AuthPortSSLPublic:
-    default: 13000
-    description: Keystone Public SSL port
-    type: number
   ContrailAuth:
     default: 'keystone'
     description: Keystone authentication method
     type: string
+  ContrailAnalyticsVIP:
+    default: ''
+    description: Contrail Analytics Api Virtual IP address
+    type: string
+  ContrailConfigPort:
+    default: 8082
+    description: Contrail Config Api port
+    type: number
+  ContrailConfigVIP:
+    default: ''
+    description: Contrail Config Virtual IP address
+    type: string
+  ContrailDiscoveryPort:
+    default: 5998
+    description: Contrail Config Api  port
+    type: number
   ContrailInsecure:
     default: false
     description: Keystone insecure mode
@@ -74,6 +82,14 @@ parameters:
     default: '127.0.0.1:12111'
     description: Memcached server
     type: string
+  ContrailVIP:
+    default: ''
+    description: Contrail VIP
+    type: string
+  ContrailWebuiVIP:
+    default: ''
+    description: Contrail Webui Virtual IP address
+    type: string
   RabbitPassword:
     description: The password for RabbitMQ
     type: string
@@ -87,29 +103,49 @@ parameters:
     description: Set rabbit subscriber port, change this if using SSL
     type: number
 
+conditions:
+  contrail_config_vip_unset: {equals : [{get_param: ContrailConfigVIP}, '']}
+  contrail_analytics_vip_unset: {equals : [{get_param: ContrailAnalyticsVIP}, '']}
+  contrail_webui_vip_unset: {equals : [{get_param: ContrailWebuiVIP}, '']}
+
 outputs:
   role_data:
     description: Shared role data for the Contrail services.
     value:
       service_name: contrail_base
       config_settings:
-        contrail::aaa_mode: {get_param: ContrailAAAMode}
-        contrail::analytics_aaa_mode: {get_param: ContrailAAAModeAnalytics}
-        contrail::admin_password: {get_param: AdminPassword}
-        contrail::admin_tenant_name: {get_param: AdminTenantName}
-        contrail::admin_token: {get_param: AdminToken}
-        contrail::admin_user: {get_param: AdminUser}
-        contrail::auth: {get_param: ContrailAuth}
-        contrail::auth_host: {get_param: [EndpointMap, KeystonePublic, host] }
-        contrail::auth_port: {get_param: [EndpointMap, KeystoneAdmin, port] }
-        contrail::auth_port_ssl: {get_param: AuthPortSSL }
-        contrail::auth_port_public: {get_param: [EndpointMap, KeystonePublic, port] }
-        contrail::auth_port_ssl_public: {get_param: AuthPortSSLPublic }
-        contrail::auth_protocol: {get_param: [EndpointMap, KeystoneInternal, protocol] }
-        contrail::api_port: {get_param: [EndpointMap, ContrailConfigInternal, port] }
-        contrail::disc_server_port: {get_param: [EndpointMap, ContrailDiscoveryInternal, port] }
-        contrail::insecure: {get_param: ContrailInsecure}
-        contrail::memcached_server: {get_param: ContrailMemcachedServer}
-        contrail::rabbit_password: {get_param: RabbitPassword}
-        contrail::rabbit_user: {get_param: RabbitUserName}
-        contrail::rabbit_port: {get_param: RabbitClientPort}
+        map_merge:
+        - contrail::aaa_mode: {get_param: AAAMode}
+          contrail::analytics_aaa_mode: {get_param: AAAModeAnalytics}
+          contrail::admin_password: {get_param: AdminPassword}
+          contrail::admin_tenant_name: {get_param: AdminTenantName}
+          contrail::admin_token: {get_param: AdminToken}
+          contrail::admin_user: {get_param: AdminUser}
+          contrail::auth: {get_param: ContrailAuth}
+          contrail::auth_host: {get_param: [EndpointMap, KeystoneAdmin, host] }
+          contrail::auth_port: {get_param: [EndpointMap, KeystoneAdmin, port] }
+          contrail::auth_port_public: {get_param: [EndpointMap, KeystonePublic, port] }
+          contrail::auth_protocol: {get_param: [EndpointMap, KeystonePublic, protocol] }
+          contrail::api_port: {get_param: ContrailConfigPort }
+          contrail::disc_server_port: {get_param: ContrailDiscoveryPort }
+          contrail::insecure: {get_param: ContrailInsecure}
+          contrail::memcached_server: {get_param: ContrailMemcachedServer}
+          contrail::rabbit_password: {get_param: RabbitPassword}
+          contrail::rabbit_user: {get_param: RabbitUserName}
+          contrail::rabbit_port: {get_param: RabbitClientPort}
+          contrail::vip: {get_param: ContrailVIP}
+        - 
+          if:
+          - contrail_config_vip_unset
+          - {}
+          - contrail_config_vip: {get_param: ContrailConfigVIP}
+        - 
+          if:
+          - contrail_webui_vip_unset
+          - {}
+          - contrail_webui_vip: {get_param: ContrailWebuiVIP}
+        - 
+          if:
+          - contrail_analytics_vip_unset
+          - {}
+          - contrail_analytics_vip: {get_param: ContrailAnalyticsVIP}