diff options
-rw-r--r-- | environments/major-upgrade-composable-steps-docker.yaml | 1 | ||||
-rw-r--r-- | environments/major-upgrade-composable-steps.yaml | 1 | ||||
-rw-r--r-- | environments/major-upgrade-converge-docker.yaml | 1 | ||||
-rw-r--r-- | environments/major-upgrade-converge.yaml | 1 | ||||
-rw-r--r-- | environments/services-docker/undercloud-aodh.yaml | 5 | ||||
-rw-r--r-- | environments/services-docker/undercloud-gnocchi.yaml | 4 | ||||
-rw-r--r-- | environments/services-docker/undercloud-panko.yaml | 2 | ||||
-rw-r--r-- | extraconfig/tasks/tripleo_upgrade_node.sh | 1 | ||||
-rw-r--r-- | network/service_net_map.j2.yaml | 1 | ||||
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 8 | ||||
-rw-r--r-- | puppet/all-nodes-config.yaml | 12 | ||||
-rw-r--r-- | puppet/services/ceilometer-base.yaml | 10 | ||||
-rw-r--r-- | puppet/services/nova-compute.yaml | 8 | ||||
-rw-r--r-- | releasenotes/notes/upgrade-stack-action-94598796a9d3511f.yaml | 9 | ||||
-rw-r--r-- | roles_data_undercloud.yaml | 16 |
15 files changed, 71 insertions, 9 deletions
diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml index 40da726d..24eedf83 100644 --- a/environments/major-upgrade-composable-steps-docker.yaml +++ b/environments/major-upgrade-composable-steps-docker.yaml @@ -5,6 +5,7 @@ resource_registry: OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml parameter_defaults: EnableConfigPurge: false + StackUpdateType: UPGRADE UpgradeLevelNovaCompute: auto UpgradeInitCommonCommand: | #!/bin/bash diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml index 8b1617f9..5a695171 100644 --- a/environments/major-upgrade-composable-steps.yaml +++ b/environments/major-upgrade-composable-steps.yaml @@ -2,6 +2,7 @@ resource_registry: OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml parameter_defaults: EnableConfigPurge: true + StackUpdateType: UPGRADE UpgradeLevelNovaCompute: auto UpgradeInitCommonCommand: | #!/bin/bash diff --git a/environments/major-upgrade-converge-docker.yaml b/environments/major-upgrade-converge-docker.yaml index 0c323621..163d1de4 100644 --- a/environments/major-upgrade-converge-docker.yaml +++ b/environments/major-upgrade-converge-docker.yaml @@ -4,6 +4,7 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml parameter_defaults: EnableConfigPurge: false + StackUpdateType: '' UpgradeLevelNovaCompute: '' UpgradeInitCommonCommand: '' UpgradeInitCommand: '' diff --git a/environments/major-upgrade-converge.yaml b/environments/major-upgrade-converge.yaml index 604e5a68..d222fb86 100644 --- a/environments/major-upgrade-converge.yaml +++ b/environments/major-upgrade-converge.yaml @@ -4,6 +4,7 @@ resource_registry: OS::TripleO::PostDeploySteps: ../puppet/post.yaml parameter_defaults: EnableConfigPurge: false + StackUpdateType: '' UpgradeLevelNovaCompute: '' UpgradeInitCommonCommand: '' UpgradeInitCommand: '' diff --git a/environments/services-docker/undercloud-aodh.yaml b/environments/services-docker/undercloud-aodh.yaml new file mode 100644 index 00000000..236512f6 --- /dev/null +++ b/environments/services-docker/undercloud-aodh.yaml @@ -0,0 +1,5 @@ +resource_registry: + OS::TripleO::Services::UndercloudAodhApi: ../docker/services/aodh-api.yaml + OS::TripleO::Services::UndercloudAodhEvaluator: ../docker/services/aodh-evaluator.yaml + OS::TripleO::Services::UndercloudAodhNotifier: ../docker/services/aodh-notifier.yaml + OS::TripleO::Services::UndercloudAodhListener: ../docker/services/aodh-listener.yaml diff --git a/environments/services-docker/undercloud-gnocchi.yaml b/environments/services-docker/undercloud-gnocchi.yaml new file mode 100644 index 00000000..55b0ac2d --- /dev/null +++ b/environments/services-docker/undercloud-gnocchi.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Services::UndercloudGnocchiApi: ../docker/services/gnocchi-api.yaml + OS::TripleO::Services::UndercloudGnocchiMetricd: ../docker/services/gnocchi-metricd.yaml + OS::TripleO::Services::UndercloudGnocchiStatsd: ../docker/services/gnocchi-statsd.yaml diff --git a/environments/services-docker/undercloud-panko.yaml b/environments/services-docker/undercloud-panko.yaml new file mode 100644 index 00000000..ffe3b6da --- /dev/null +++ b/environments/services-docker/undercloud-panko.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::UndercloudPankoApi: ../docker/services/panko-api.yaml diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh index a5a312dc..1114897f 100644 --- a/extraconfig/tasks/tripleo_upgrade_node.sh +++ b/extraconfig/tasks/tripleo_upgrade_node.sh @@ -50,6 +50,7 @@ fi if [[ -n \$NOVA_COMPUTE ]]; then log_debug "Restarting openstack ceilometer agent compute" systemctl restart openstack-ceilometer-compute + yum install -y openstack-nova-migration fi # Apply puppet manifest to converge just right after the ${ROLE} upgrade diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 7fb9420c..26ff3e0a 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -54,6 +54,7 @@ parameters: HeatApiCfnNetwork: internal_api HeatApiCloudwatchNetwork: internal_api NovaApiNetwork: internal_api + NovaColdMigrationNetwork: ctlplane NovaPlacementNetwork: internal_api NovaMetadataNetwork: internal_api NovaVncProxyNetwork: internal_api diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 4956bfc4..ea080be9 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -199,6 +199,9 @@ resource_registry: OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml OS::TripleO::Services::GnocchiStatsd: puppet/services/gnocchi-statsd.yaml + OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None + OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None + OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None # Services that are disabled by default (use relevant environment files): OS::TripleO::Services::FluentdClient: OS::Heat::None OS::TripleO::Services::Collectd: OS::Heat::None @@ -216,7 +219,12 @@ resource_registry: OS::TripleO::Services::AodhEvaluator: puppet/services/aodh-evaluator.yaml OS::TripleO::Services::AodhNotifier: puppet/services/aodh-notifier.yaml OS::TripleO::Services::AodhListener: puppet/services/aodh-listener.yaml + OS::TripleO::Services::UndercloudAodhApi: OS::Heat::None + OS::TripleO::Services::UndercloudAodhEvaluator: OS::Heat::None + OS::TripleO::Services::UndercloudAodhNotifier: OS::Heat::None + OS::TripleO::Services::UndercloudAodhListener: OS::Heat::None OS::TripleO::Services::PankoApi: puppet/services/panko-api.yaml + OS::TripleO::Services::UndercloudPankoApi: OS::Heat::None OS::TripleO::Services::MistralEngine: OS::Heat::None OS::TripleO::Services::MistralApi: OS::Heat::None OS::TripleO::Services::MistralExecutor: OS::Heat::None diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 7edf17af..60290f64 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -55,9 +55,18 @@ parameters: StackAction: type: string description: > - Heat action on performed top-level stack. + Heat action on performed top-level stack. Note StackUpdateType is + set to UPGRADE when a major-version upgrade is in progress. constraints: - allowed_values: ['CREATE', 'UPDATE'] + StackUpdateType: + type: string + description: > + Type of update, to differentiate between UPGRADE and UPDATE cases + when StackAction is UPDATE (both are the same stack action). + constraints: + - allowed_values: ['', 'UPGRADE'] + default: '' # NOTE(jaosorior): This is being set as IPA as it's the first # CA we'll actually be testing out. But we can change this if # people request it. @@ -170,6 +179,7 @@ resources: deploy_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: UpdateIdentifier} stack_action: {get_param: StackAction} + stack_update_type: {get_param: StackUpdateType} vip_data: map_merge: # Dynamically generate per-service VIP data based on enabled_services diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 761e6bd6..6e909097 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -65,6 +65,14 @@ parameters: description: Whether to create or skip API endpoint. Set this to false, if you choose to disable Ceilometer API service. type: boolean + SnmpdReadonlyUserName: + default: ro_snmp_user + description: The user name for SNMPd with readonly rights running on all Overcloud nodes + type: string + SnmpdReadonlyUserPassword: + description: The user password for SNMPd with readonly rights running on all Overcloud nodes + type: string + hidden: true outputs: role_data: @@ -97,6 +105,8 @@ outputs: ceilometer::rabbit_port: {get_param: RabbitClientPort} ceilometer::rabbit_heartbeat_timeout_threshold: 60 ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret} + ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName} + ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} service_config_settings: keystone: ceilometer_auth_enabled: true diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index b1711436..52f48696 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -119,6 +119,11 @@ outputs: nova::compute::libvirt::migration_support: false tripleo::profile::base::nova::manage_migration: true tripleo::profile::base::nova::migration_ssh_key: {get_param: MigrationSshKey} + tripleo::profile::base::nova::migration_ssh_localaddrs: + - "%{hiera('cold_migration_ssh_inbound_addr')}" + - "%{hiera('live_migration_ssh_inbound_addr')}" + live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} + cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaColdMigrationNetwork]} tripleo::profile::base::nova::nova_compute_enabled: true nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName} nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName} @@ -175,6 +180,9 @@ outputs: template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL" params: LEVEL: {get_param: UpgradeLevelNovaCompute} + - name: install openstack-nova-migration + tags: step3 + yum: name=openstack-nova-migration state=latest - name: Start nova-compute service tags: step6 service: name=openstack-nova-compute state=started diff --git a/releasenotes/notes/upgrade-stack-action-94598796a9d3511f.yaml b/releasenotes/notes/upgrade-stack-action-94598796a9d3511f.yaml new file mode 100644 index 00000000..bdff0e6e --- /dev/null +++ b/releasenotes/notes/upgrade-stack-action-94598796a9d3511f.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The new StackUpdateType parameter is now set to UPGRADE + when a major version upgrade is in progress. This enables application + configuration via puppet to distinuish a major version upgrade from a + normal stack update (e.g for minor updates or reconfiguration) by + inspecting the stack_update_type hiera value. In future other values may be added to + flag e.g minor updates vs reconfiguration, but for now only UPGRADE is considered. diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index df2e196b..9894f00e 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -37,11 +37,11 @@ - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::AodhApi - - OS::TripleO::Services::AodhEvaluator - - OS::TripleO::Services::AodhNotifier - - OS::TripleO::Services::AodhListener - - OS::TripleO::Services::GnocchiApi - - OS::TripleO::Services::GnocchiMetricd - - OS::TripleO::Services::GnocchiStatsd - - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::UndercloudAodhApi + - OS::TripleO::Services::UndercloudAodhEvaluator + - OS::TripleO::Services::UndercloudAodhNotifier + - OS::TripleO::Services::UndercloudAodhListener + - OS::TripleO::Services::UndercloudGnocchiApi + - OS::TripleO::Services::UndercloudGnocchiMetricd + - OS::TripleO::Services::UndercloudGnocchiStatsd + - OS::TripleO::Services::UndercloudPankoApi |