This repository has been archived by the owner on Feb 29, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 178
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge "Move cell_v2 discovery off compute hosts" into stable/victoria
- Loading branch information
Showing
7 changed files
with
178 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| heat_template_version: rocky | ||
|
|
||
| description: > | ||
| OpenStack containerized nova-manage runner service | ||
| parameters: | ||
| ContainerNovaConductorImage: | ||
| description: image | ||
| type: string | ||
| 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 | ||
|
|
||
|
|
||
| resources: | ||
|
|
||
| # Cannot control nova-manage logging so expect it to log to file | ||
| NovaLogging: | ||
| type: ../logging/files/nova-common.yaml | ||
| properties: | ||
| ContainerNovaImage: &nova_conductor_image {get_param: ContainerNovaConductorImage} | ||
| NovaServiceName: 'manager' | ||
|
|
||
| ContainersCommon: | ||
| type: ../containers-common.yaml | ||
|
|
||
| NovaConductorBase: | ||
| type: ./nova-conductor-container-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-manage runner service. | ||
| value: | ||
| service_name: nova_manager | ||
| config_settings: | ||
| get_attr: [NovaConductorBase, role_data, config_settings] | ||
| service_config_settings: | ||
| mysql: | ||
| get_attr: [NovaConductorBase, role_data, service_config_settings, mysql] | ||
| # BEGIN DOCKER SETTINGS | ||
| puppet_config: | ||
| get_attr: [NovaConductorBase, role_data, puppet_config] | ||
| kolla_config: | ||
| /var/lib/kolla/config_files/nova_manager.json: | ||
| command: "/bin/sleep infinity" | ||
| 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_2: | ||
| get_attr: [NovaLogging, docker_config, step_2] | ||
| step_4: | ||
| nova_manager: | ||
| image: *nova_conductor_image | ||
| net: host | ||
| privileged: false | ||
| restart: always | ||
| volumes: | ||
| list_concat: | ||
| - {get_attr: [ContainersCommon, volumes]} | ||
| - {get_attr: [NovaLogging, volumes]} | ||
| - | ||
| - /var/lib/kolla/config_files/nova_manager.json:/var/lib/kolla/config_files/config.json:ro | ||
| - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro | ||
| environment: | ||
| KOLLA_CONFIG_STRATEGY: COPY_ALWAYS | ||
| host_prep_tasks: | ||
| get_attr: [NovaLogging, host_prep_tasks] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
releasenotes/notes/cell_v2_discovery_off_computes-2b977c6b9a01cde2.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- | ||
| issues: | ||
| - | | ||
| Cell_v2 discovery has been moved from the nova-compute|nova-ironic | ||
| containers as this requires nova api database credentials which must | ||
| not be configured for the nova-compute service. | ||
| As a result scale-up deployments which explicitly omit the Controller | ||
| nodes will need to make alternative arrangements to run cell_v2 discovery. | ||
| Either the nova-manage command can be run manually after scale-up, or | ||
| an additional helper node using the NovaManage role can be deployed that | ||
| will be used for this task instead of a Controller node. See Bug: | ||
| `1786961 <https://launchpad.net/bugs/1786961>`_ and Bug: | ||
| `1871482 <https://launchpad.net/bugs/1871482>`_. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| ############################################################################### | ||
| # Role: NovaManager | ||
| ############################################################################### | ||
| - name: NovaManager | ||
| description: | | ||
| Role to run nova-manage runner container on a separate host | ||
| networks: | ||
| InternalApi: | ||
| subnet: internal_api_subnet | ||
| HostnameFormatDefault: '%stackname%-novamanager-%index%' | ||
| update_serial: 25 | ||
| ServicesDefault: | ||
| - OS::TripleO::Services::Aide | ||
| - OS::TripleO::Services::AuditD | ||
| - OS::TripleO::Services::BootParams | ||
| - OS::TripleO::Services::CACerts | ||
| - OS::TripleO::Services::CertmongerUser | ||
| - OS::TripleO::Services::Collectd | ||
| - OS::TripleO::Services::IpaClient | ||
| - OS::TripleO::Services::Ipsec | ||
| - OS::TripleO::Services::Kernel | ||
| - OS::TripleO::Services::LoginDefs | ||
| - OS::TripleO::Services::MetricsQdr | ||
| - OS::TripleO::Services::MySQLClient | ||
| - OS::TripleO::Services::NovaManager | ||
| - OS::TripleO::Services::ContainersLogrotateCrond | ||
| - OS::TripleO::Services::Podman | ||
| - OS::TripleO::Services::Rhsm | ||
| - OS::TripleO::Services::Rsyslog | ||
| - OS::TripleO::Services::Securetty | ||
| - OS::TripleO::Services::Snmp | ||
| - OS::TripleO::Services::Sshd | ||
| - OS::TripleO::Services::Timesync | ||
| - OS::TripleO::Services::Timezone | ||
| - OS::TripleO::Services::TripleoFirewall | ||
| - OS::TripleO::Services::TripleoPackages | ||
| - OS::TripleO::Services::Tuned |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters