From 63c451869350ef9e3e73699c5cc363a45ea9d277 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Wed, 24 Apr 2019 15:49:53 +0200 Subject: [PATCH] nova: Remove the NovaPlacement service Deprecated by Ic904aba7c19eda0a0a22dd2d13b9d4182b4595c4 the service can now be removed in Train. Change-Id: Ic1d59f93f930f093164ac294730a5cbb08a5bded --- .../nova/nova-placement-container-puppet.yaml | 242 ----------------- deployment/logging/files/nova-placement.yaml | 49 ---- deployment/logging/stdout/nova-placement.yaml | 60 ----- deployment/nova/nova-base-puppet.yaml | 15 -- .../ssl/no-tls-endpoints-public-ip.yaml | 3 - .../ssl/tls-endpoints-public-dns.yaml | 3 - environments/ssl/tls-endpoints-public-ip.yaml | 3 - .../ssl/tls-everywhere-endpoints-dns.yaml | 3 - environments/stdout-logging.yaml | 1 - network/endpoints/endpoint_data.yaml | 15 -- network/endpoints/endpoint_map.yaml | 249 ------------------ network/service_net_map.j2.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - sample-env-generator/ssl.yaml | 12 - tools/yaml-validate.py | 1 - 15 files changed, 658 deletions(-) delete mode 100644 deployment/deprecated/nova/nova-placement-container-puppet.yaml delete mode 100644 deployment/logging/files/nova-placement.yaml delete mode 100644 deployment/logging/stdout/nova-placement.yaml diff --git a/deployment/deprecated/nova/nova-placement-container-puppet.yaml b/deployment/deprecated/nova/nova-placement-container-puppet.yaml deleted file mode 100644 index ca1abc48f5..0000000000 --- a/deployment/deprecated/nova/nova-placement-container-puppet.yaml +++ /dev/null @@ -1,242 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack containerized Nova Placement API service. Note, this service is - deprecated in Stein and will be replaced in Train by an extracted Placement - API service. - -parameters: - DockerNovaPlacementImage: - description: image - type: string - DockerNovaPlacementConfigImage: - description: The container image to use for the nova_placement config_volume - type: string - NovaPlacementLoggingSource: - type: json - default: - tag: openstack.nova.placement - path: /var/log/containers/httpd/nova_placement_wsgi_error_ssl.log - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EnableInternalTLS: - type: boolean - default: false - NovaWorkers: - default: 0 - description: Number of workers for Nova services. - type: number - NovaPassword: - description: The password for the nova service and db account - type: string - hidden: true - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - MonitoringSubscriptionNovaPlacement: - default: 'overcloud-nova-placement' - type: string - -conditions: - - internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} - nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} - -resources: - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../../deployment/database/mysql-client.yaml - - NovaPlacementLogging: - type: OS::TripleO::Services::Logging::NovaPlacement - - ApacheServiceBase: - type: ../../../deployment/apache/apache-baremetal-puppet.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - EnableInternalTLS: {get_param: EnableInternalTLS} - - NovaBase: - type: ../../nova/nova-base-puppet.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Nova Placement API role. - value: - service_name: nova_placement - monitoring_subscription: {get_param: MonitoringSubscriptionNovaPlacement} - config_settings: - map_merge: - - get_attr: [NovaBase, role_data, config_settings] - - get_attr: [NovaPlacementLogging, config_settings] - - apache::default_vhost: false - - get_attr: [ApacheServiceBase, role_data, config_settings] - - tripleo::nova_placement::firewall_rules: - '138 nova_placement': - dport: - - 8778 - - 13778 - nova::keystone::authtoken::project_name: 'service' - nova::keystone::authtoken::password: {get_param: NovaPassword} - nova::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - nova::wsgi::apache_placement::api_port: '8778' - nova::wsgi::apache_placement::ssl: {get_param: EnableInternalTLS} - # NOTE: bind IP is found in hiera replacing the network name with the local node IP - # for the given network; replacement examples (eg. for internal_api): - # internal_api -> IP - # internal_api_uri -> [IP] - # internal_api_subnet - > IP/CIDR - nova::wsgi::apache_placement::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, NovaPlacementNetwork]} - nova::wsgi::apache_placement::servername: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, NovaPlacementNetwork]} - - - if: - - nova_workers_zero - - {} - - nova::wsgi::apache_placement::workers: {get_param: NovaWorkers} - service_config_settings: - fluentd: - tripleo_fluentd_groups_nova_placement: - - nova - tripleo_fluentd_sources_nova_placement: - - {get_param: NovaPlacementLoggingSource} - keystone: - nova::keystone::auth_placement::tenant: 'service' - nova::keystone::auth_placement::public_url: {get_param: [EndpointMap, NovaPlacementPublic, uri]} - nova::keystone::auth_placement::internal_url: {get_param: [EndpointMap, NovaPlacementInternal, uri]} - nova::keystone::auth_placement::admin_url: {get_param: [EndpointMap, NovaPlacementAdmin, uri]} - nova::keystone::auth_placement::password: {get_param: NovaPassword} - nova::keystone::auth_placement::region: {get_param: KeystoneRegion} - mysql: - map_merge: - - {get_attr: [NovaBase, role_data, service_config_settings, mysql]} - - nova::db::mysql_placement::password: {get_param: NovaPassword} - nova::db::mysql_placement::user: nova_placement - nova::db::mysql_placement::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - nova::db::mysql_placement::dbname: nova_placement - nova::db::mysql_placement::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: nova_placement - puppet_tags: nova_config - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::nova::placement - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: DockerNovaPlacementConfigImage} - kolla_config: - /var/lib/kolla/config_files/nova_placement.json: - command: /usr/sbin/httpd -DFOREGROUND - config_files: - - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.d" - dest: "/etc/httpd/conf.d" - merge: false - preserve_properties: true - - 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_2: - get_attr: [NovaPlacementLogging, docker_config, step_2] - # start this early so it is up before computes start reporting - step_4: - nova_placement: - start_order: 1 - image: {get_param: DockerNovaPlacementImage} - net: host - user: root - restart: always - healthcheck: - test: /openstack/healthcheck - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - get_attr: [NovaPlacementLogging, volumes] - - - - /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 - - - 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 - host_prep_tasks: - - {get_attr: [NovaPlacementLogging, host_prep_tasks]} - - name: create persistent directory - file: - path: /var/lib/nova - state: directory - setype: svirt_sandbox_file_t - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - nova_placement diff --git a/deployment/logging/files/nova-placement.yaml b/deployment/logging/files/nova-placement.yaml deleted file mode 100644 index 49030f66c3..0000000000 --- a/deployment/logging/files/nova-placement.yaml +++ /dev/null @@ -1,49 +0,0 @@ -heat_template_version: rocky - -description: > - Template for nova-placement's logging to files - -parameters: - DockerNovaPlacementImage: - description: image - type: string - -outputs: - config_settings: - description: Extra hieradata needed to log to files in the host. - value: null - volumes: - description: The volumes needed to log to files in the host. - value: &nova_placement_volumes - - /var/log/containers/nova:/var/log/nova:z - - /var/log/containers/httpd/nova-placement:/var/log/httpd:z - docker_config: - description: Extra containers needed for logging to files in the host. - value: - step_2: - nova_placement_init_log: - start_order: 1 - image: {get_param: DockerNovaPlacementImage} - net: none - user: root - command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova'] - volumes: *nova_placement_volumes - host_prep_tasks: - description: Extra ansible tasks needed for logging to files in the host. - value: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - with_items: - - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t } - - { 'path': /var/log/containers/httpd/nova-placement, 'setype': svirt_sandbox_file_t } - - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t } - - name: nova logs readme - copy: - dest: /var/log/nova/readme.txt - content: | - Log files from nova containers can be found under - /var/log/containers/nova and /var/log/containers/httpd/nova-*. - ignore_errors: true diff --git a/deployment/logging/stdout/nova-placement.yaml b/deployment/logging/stdout/nova-placement.yaml deleted file mode 100644 index e7e3cf6982..0000000000 --- a/deployment/logging/stdout/nova-placement.yaml +++ /dev/null @@ -1,60 +0,0 @@ -heat_template_version: rocky - -description: > - Template for nova-placement's logging to stdout - -parameters: - DockerNovaPlacementImage: - description: image - type: string - -outputs: - config_settings: - description: Extra hieradata needed to log to stdout. - value: - nova::wsgi::apache_placement::access_log_file: /var/log/httpd/access.log - nova::wsgi::apache_placement::error_log_file: /var/log/httpd/error_log - volumes: - description: The volumes needed to log to stdout or a sidecar container. - value: - - NovaPlacementLogs:/var/log/ - docker_config: - description: Extra containers needed for logging to stdout or a sidecar container. - value: - step_2: - nova_placement_apache_error_logs: - start_order: 1 - image: {get_param: DockerNovaPlacementImage} - user: root - privileged: false - restart: always - healthcheck: - test: '[ -p /var/log/httpd/error_log ]' - command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done'] - volumes: - - NovaPlacementLogs:/var/log/ - nova_placement_apache_access_logs: - start_order: 1 - image: {get_param: DockerNovaPlacementImage} - user: root - privileged: false - restart: always - healthcheck: - test: '[ -p /var/log/httpd/access.log ]' - command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done'] - volumes: - - NovaPlacementLogs:/var/log/ - nova_placement_logs: - start_order: 2 - image: {get_param: DockerNovaPlacementImage} - user: nova - privileged: false - restart: always - healthcheck: - test: '[ -p /var/log/nova/nova-placement-api.log ]' - command: ['/bin/bash', '-c', 'mkdir -p /var/log/nova && rm -f /var/log/nova/nova-placement-api.log && mkfifo /var/log/nova/nova-placement-api.log && while true; do cat /var/log/nova/nova-placement-api.log; done'] - volumes: - - NovaPlacementLogs:/var/log/ - host_prep_tasks: - description: Extra ansible tasks needed for logging to files in the host. - value: null diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 8dcb5779a8..2ddbad6f39 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -195,11 +195,6 @@ parameters: description: > Cron to purge shadow tables - All cells default: false - NovaPlacementAPIInterface: - type: string - description: > - Endpoint interface to be used for the placement API. - default: 'internal' NovaOVSDBConnection: type: string description: OVS DB connection string to used by Nova @@ -315,16 +310,6 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - nova::placement_database_connection: - make_url: - scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} - username: nova_api - password: {get_param: NovaPassword} - host: {get_param: [EndpointMap, MysqlInternal, host]} - path: /nova_api - query: - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo nova::logging::debug: if: - service_debug_unset diff --git a/environments/ssl/no-tls-endpoints-public-ip.yaml b/environments/ssl/no-tls-endpoints-public-ip.yaml index 0a21860486..378991a9ce 100644 --- a/environments/ssl/no-tls-endpoints-public-ip.yaml +++ b/environments/ssl/no-tls-endpoints-public-ip.yaml @@ -77,9 +77,6 @@ parameter_defaults: NovaInternal: {protocol: http, port: '8774', host: IP_ADDRESS} NovaPublic: {protocol: http, port: '8774', host: IP_ADDRESS} NovaUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS} - NovaPlacementAdmin: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementInternal: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementPublic: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementAdmin: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementInternal: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementPublic: {protocol: http, port: '8778', host: IP_ADDRESS} diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index a5a3c8fe26..d40888dfa1 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -73,9 +73,6 @@ parameter_defaults: NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovaUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - NovaPlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} PlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index ed4085f1d3..39b32e3c73 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -73,9 +73,6 @@ parameter_defaults: NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'IP_ADDRESS'} NovaUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - NovaPlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'IP_ADDRESS'} PlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementPublic: {protocol: 'https', port: '13778', host: 'IP_ADDRESS'} diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 1e34a8f84e..53fcf0c44f 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -73,9 +73,6 @@ parameter_defaults: NovaInternal: {protocol: 'https', port: '8774', host: 'CLOUDNAME'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovaUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'} - NovaPlacementAdmin: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} - NovaPlacementInternal: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} PlacementAdmin: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} PlacementInternal: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} PlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} diff --git a/environments/stdout-logging.yaml b/environments/stdout-logging.yaml index 89b6083102..dac5cb0f88 100644 --- a/environments/stdout-logging.yaml +++ b/environments/stdout-logging.yaml @@ -12,7 +12,6 @@ resource_registry: OS::TripleO::Services::Logging::NeutronCommon: ../deployment/logging/stdout/neutron-common.yaml OS::TripleO::Services::Logging::NovaApi: ../deployment/logging/stdout/nova-api.yaml OS::TripleO::Services::Logging::NovaCommon: ../deployment/logging/stdout/nova-common.yaml - OS::TripleO::Services::Logging::NovaPlacement: ../deployment/logging/stdout/nova-placement.yaml OS::TripleO::Services::Logging::NovaMetadata: ../deployment/logging/stdout/nova-metadata.yaml OS::TripleO::Services::Logging::NovaLibvirt: ../deployment/logging/stdout/nova-libvirt.yaml OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/stdout/panko-api.yaml diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index d9b1501d7a..88d9ec138b 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -240,21 +240,6 @@ Nova: port: 3000 port: 8774 -NovaPlacement: - Internal: - net_param: NovaPlacement - uri_suffixes: - '': /placement - Public: - net_param: Public - uri_suffixes: - '': /placement - Admin: - net_param: NovaPlacement - uri_suffixes: - '': /placement - port: 8778 - Placement: Internal: net_param: Placement diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 3906c61591..2a527c6827 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -80,9 +80,6 @@ parameters: NovaInternal: {protocol: http, port: '8774', host: IP_ADDRESS} NovaPublic: {protocol: http, port: '8774', host: IP_ADDRESS} NovaUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS} - NovaPlacementAdmin: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementInternal: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementPublic: {protocol: http, port: '8778', host: IP_ADDRESS} NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS} NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS} NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS} @@ -6150,252 +6147,6 @@ outputs: template: NETWORK_uri port: get_param: [EndpointMap, NovaUIConfig, port] - NovaPlacementAdmin: - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, NovaPlacementNetwork] - port: - get_param: [EndpointMap, NovaPlacementAdmin, port] - protocol: - get_param: [EndpointMap, NovaPlacementAdmin, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementAdmin, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementAdmin, port] - path: /placement - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementAdmin, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementAdmin, port] - NovaPlacementInternal: - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, NovaPlacementNetwork] - port: - get_param: [EndpointMap, NovaPlacementInternal, port] - protocol: - get_param: [EndpointMap, NovaPlacementInternal, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementInternal, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementInternal, port] - path: /placement - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementInternal, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, NovaPlacementNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, NovaPlacementNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementInternal, port] - NovaPlacementPublic: - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, PublicNetwork] - port: - get_param: [EndpointMap, NovaPlacementPublic, port] - protocol: - get_param: [EndpointMap, NovaPlacementPublic, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementPublic, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementPublic, port] - path: /placement - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, NovaPlacementPublic, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, NovaPlacementPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, NovaPlacementPublic, port] NovaVNCProxyAdmin: host: str_replace: diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index eea4eb371e..a4ab4f3876 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -56,7 +56,6 @@ parameters: HeatApiCfnNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaPlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 34f5821cb2..2f4a794606 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -353,7 +353,6 @@ resource_registry: OS::TripleO::Services::Logging::NovaMetadata: deployment/logging/files/nova-metadata.yaml OS::TripleO::Services::Logging::NovaCommon: deployment/logging/files/nova-common.yaml OS::TripleO::Services::Logging::NovaLibvirt: OS::Heat::None - OS::TripleO::Services::Logging::NovaPlacement: deployment/logging/files/nova-placement.yaml OS::TripleO::Services::Logging::OpenDaylightApi: deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml OS::TripleO::Services::Logging::PankoApi: deployment/logging/files/panko-api.yaml OS::TripleO::Services::Logging::PlacementApi: deployment/logging/files/placement-api.yaml diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 6097b4f061..806cdcffc3 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -182,9 +182,6 @@ environments: NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'IP_ADDRESS'} NovaUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - NovaPlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'IP_ADDRESS'} PlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementPublic: {protocol: 'https', port: '13778', host: 'IP_ADDRESS'} @@ -302,9 +299,6 @@ environments: NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovaUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - NovaPlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} PlacementAdmin: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementInternal: {protocol: 'http', port: '8778', host: 'IP_ADDRESS'} PlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} @@ -422,9 +416,6 @@ environments: NovaInternal: {protocol: 'https', port: '8774', host: 'CLOUDNAME'} NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'} NovaUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'} - NovaPlacementAdmin: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} - NovaPlacementInternal: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} - NovaPlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} PlacementAdmin: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} PlacementInternal: {protocol: 'https', port: '8778', host: 'CLOUDNAME'} PlacementPublic: {protocol: 'https', port: '13778', host: 'CLOUDNAME'} @@ -552,9 +543,6 @@ environments: NovaInternal: {protocol: http, port: '8774', host: IP_ADDRESS} NovaPublic: {protocol: http, port: '8774', host: IP_ADDRESS} NovaUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS} - NovaPlacementAdmin: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementInternal: {protocol: http, port: '8778', host: IP_ADDRESS} - NovaPlacementPublic: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementAdmin: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementInternal: {protocol: http, port: '8778', host: IP_ADDRESS} PlacementPublic: {protocol: http, port: '8778', host: IP_ADDRESS} diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 4be99133ae..51aeddff62 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -136,7 +136,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description', 'NovaConductorLoggingSource': ['default'], 'NovaConsoleauthLoggingSource': ['default'], 'NovaMetadataLoggingSource': ['default'], - 'NovaPlacementLoggingSource': ['default'], 'NovaSchedulerLoggingSource': ['default'], 'NovaVncproxyLoggingSource': ['default'], 'OctaviaApiLoggingSource': ['default'],