From 4cf8e945d96b9b086c9494e5b99c52cd8e767a65 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 29 Mar 2019 10:31:54 -0400 Subject: [PATCH] Update docker/services refs to use deployment Change-Id: I4e65ff32afb7388e9b6c6cc4fd3cbca70bf3b314 --- .../oslo_messaging_config.rst | 16 ++++++++-------- .../developer/upgrades/fast_fw_upgrade.rst | 2 +- .../upgrade/developer/upgrades/major_upgrade.rst | 2 +- doc/source/upgrade/fast_forward_upgrade.rst | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/source/install/advanced_deployment/oslo_messaging_config.rst b/doc/source/install/advanced_deployment/oslo_messaging_config.rst index 4ca94b01..20b1a66f 100644 --- a/doc/source/install/advanced_deployment/oslo_messaging_config.rst +++ b/doc/source/install/advanced_deployment/oslo_messaging_config.rst @@ -48,11 +48,11 @@ resource association for this defacto deployment configuration:: RpcPort: 5672 resource_registry: - OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-rabbitmq.yaml + OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml + OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml -The `rpc-rabbitmq.yaml`_ instantiates the rabbitmq server backend -while `notify-rabbitmq-shared.yaml`_ sets up the notification +The `rabbitmq-messaging-rpc-container-puppet.yaml`_ instantiates the rabbitmq server backend +while `rabbitmq-messaging-notify-container-puppet.yaml`_ sets up the notification transport configuration to use the same shared rabbitmq server. Deployment of Separate RPC and Notify Messaging Backends @@ -86,8 +86,8 @@ overcloud deployment:: RpcPort: 31459 resource_registry: - OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml + OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml + OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml The above will instantiate qdrouterd server(s) and configure them for use as the RPC transport and will also instantiate the rabbitmq backend @@ -102,6 +102,6 @@ command to deploy with separate messaging backends:: openstack overcloud deploy --templates -e /usr/share/openstack-tripleo-heat-templates/environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml .. _`standard messaging`: https://github.com/openstack/tripleo-heat-templates/blob/master/environments/messaging/rpc-rabbitmq-notify-rabbitmq-shared.yaml -.. _`rpc-rabbitmq.yaml`: https://github.com/openstack/tripleo-heat-templates/blob/master/docker/services/messaging/rpc-rabbitmq.yaml -.. _`notify-rabbitmq-shared.yaml`: https://github.com/openstack/tripleo-heat-templates/blob/master/docker/services/messaging/notify-rabbitmq-shared.yaml +.. _`rabbitmq-messaging-rpc-container-puppet.yaml`: https://github.com/openstack/tripleo-heat-templates/blob/master/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +.. _`rabbitmq-messaging-notify-container-puppet.yaml`: https://github.com/openstack/tripleo-heat-templates/blob/master/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml .. _`hybrid messaging`: https://github.com/openstack/tripleo-heat-templates/blob/master/environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml diff --git a/doc/source/upgrade/developer/upgrades/fast_fw_upgrade.rst b/doc/source/upgrade/developer/upgrades/fast_fw_upgrade.rst index e62d3a34..5e5e60ad 100644 --- a/doc/source/upgrade/developer/upgrades/fast_fw_upgrade.rst +++ b/doc/source/upgrade/developer/upgrades/fast_fw_upgrade.rst @@ -157,7 +157,7 @@ And where the *fast_forward_upgrade_bootstrap_role_tasks.yaml* include the when: role_name == 'Compute' and ansible_hostname == Compute[0] ...etc -.. _neutron-api: https://github.com/openstack/tripleo-heat-templates/blob/master/docker/services/neutron-api.yaml#L190 +.. _neutron-api: https://github.com/openstack/tripleo-heat-templates/blob/master/deployment/neutron/neutron-api-container-puppet.yaml#L415 .. _spec: https://github.com/openstack/tripleo-specs/blob/master/specs/queens/fast-forward-upgrades.rst .. _deploy-steps.j2: https://github.com/openstack/tripleo-heat-templates/blob/master/common/deploy-steps.j2#L377 .. _config-download: https://github.com/openstack/tripleo-common/blob/master/tripleo_common/utils/config.py diff --git a/doc/source/upgrade/developer/upgrades/major_upgrade.rst b/doc/source/upgrade/developer/upgrades/major_upgrade.rst index 47ac634b..29c14320 100644 --- a/doc/source/upgrade/developer/upgrades/major_upgrade.rst +++ b/doc/source/upgrade/developer/upgrades/major_upgrade.rst @@ -382,5 +382,5 @@ package_update.yaml and so that is what we need to update here: sudo systemctl restart openstack-mistral-engine.service sudo systemctl restart openstack-mistral-executor.service -.. _rabbitmq_upgrade_tasks: https://github.com/openstack/tripleo-heat-templates/blob/9a2923210c2773e59175571f5ecbfe2b8682737a/docker/services/pacemaker/rabbitmq.yaml#L261 +.. _rabbitmq_upgrade_tasks: https://github.com/openstack/tripleo-heat-templates/blob/master/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml#L305 .. _562995: https://review.openstack.org/#/c/562995 diff --git a/doc/source/upgrade/fast_forward_upgrade.rst b/doc/source/upgrade/fast_forward_upgrade.rst index a03dcf6f..55324fd6 100644 --- a/doc/source/upgrade/fast_forward_upgrade.rst +++ b/doc/source/upgrade/fast_forward_upgrade.rst @@ -610,15 +610,15 @@ Following there is a list of all the changes needed: 7. In your resource_registry, check that you are using the containerized - services from the docker/services subdirectory of your core Heat template + services from the deployment subdirectory of your core Heat template collection. For example: :: resource_registry: - OS::TripleO::Services::CephMon: ../docker/services/ceph-ansible/ceph-mon.yaml - OS::TripleO::Services::CephOSD: ../docker/services/ceph-ansible/ceph-osd.yaml - OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml + OS::TripleO::Services::CephMon: ../deployment/ceph-ansible/ceph-mon.yaml + OS::TripleO::Services::CephOSD: ../deployment/ceph-ansible/ceph-osd.yaml + OS::TripleO::Services::CephClient: ../deployment/ceph-ansible/ceph-client.yaml 8. When upgrading to Queens, if Ceph has been deployed in the Overcloud, then @@ -885,7 +885,7 @@ For DPDK environments: :: resource_registry: - OS::TripleO::Services::ComputeNeutronOvsDpdk: ../docker/services/neutron-ovs-dpdk-agent.yaml + OS::TripleO::Services::ComputeNeutronOvsDpdk: ../deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml For SR-IOV environments: @@ -895,4 +895,4 @@ For SR-IOV environments: :: resource_registry: - OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml + OS::TripleO::Services::NeutronSriovAgent: ../deployment/neutron/neutron-sriov-agent-container-puppet.yaml