puppet/services -> deployments updates

Updates most of the puppet/services links which now live in
the t-h-t deployments directory.

Change-Id: I7ada61d432085538587f069cfc5256c5b42589b5
Related-Blueprint: services-yaml-flattening

doc/source/developer/tht_walkthrough/changes-tht.rst

@@ -45,14 +45,13 @@ The list of changes in THT are:
   puppet-tripleo repository.
 
 - Create a service type specific folder in the root services folder
-  (``puppet/services/time``).
+  (``deployment/time``).
 
-- Create a heat template for the service inside the puppet/services folder
+- Create a heat template for the service inside the deployment/time folder
-  (``puppet/services/time/ntp.yaml``).
+  (``deployment/time/ntp-baremetal-puppet.yaml``).
 
 - Optionally, create a common heat template to reuse common configuration
-  data, which is referenced from each per-service heat template
+  data, which is referenced from each per-service heat template.
-  (``puppet/services/time/ntp-base.yaml``).
 
 Step 1 - Updating puppet references
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -90,7 +89,7 @@ heat template file, as described above.
 By updating the resource registry we are forcing to use a nested template to
 configure our resources. In the example case the created resource
 (OS::TripleO::Services::Timesync), will point to the corresponding service yaml file
-(puppet/services/time/ntp.yaml).
+(deployment/time/ntp-baremetal-puppet.yaml).
 
 
 Step 3 - roles_data.yaml initial changes
@@ -158,13 +157,13 @@ THT changes for all the different roles are covered in:
 Step 4 - Create the services yaml files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Create: ``puppet/services/time/ntp.yaml``
+Create: ``deployment/time/ntp-baremetal-puppet.yaml``
 
 This file will have all the configuration details for the service to be
 configured.
 ::
 
-  heat_template_version: 2016-04-08
+  heat_template_version: rocky
   description: >
     NTP service deployment using puppet, this YAML file
     creates the interface between the HOT template

doc/source/developer/tht_walkthrough/design-patterns.rst

@@ -19,7 +19,7 @@ files.
 the different environments (With pacemaker and without pacemaker).
 ::
 
-  heat_template_version: 2016-04-08
+  heat_template_version: rocky
   description: >
     Configuration details for MongoDB service using composable roles
   parameters:
@@ -52,7 +52,7 @@ Referencing the common parameter:
 pacemaker.
 ::
 
-  heat_template_version: 2016-04-08
+  heat_template_version: rocky
   description: >
     MongoDb service deployment using puppet
   parameters:

doc/source/install/advanced_deployment/security_hardening.rst

@@ -89,7 +89,7 @@ SSH ``/etc/issue`` Banner text can be set using the following parameters in an
 environment file::
 
     resource_registry:
-      OS::TripleO::Services::Sshd: ../puppet/services/sshd.yaml
+      OS::TripleO::Services::Sshd: ../deployment/sshd/sshd-baremetal-puppet.yaml
 
     parameter_defaults:
       BannerText: |
@@ -175,7 +175,7 @@ the iptables rule on the appropriate node (controller, in case of rabbitmq)::
     -A INPUT -p tcp -m multiport --dports 4369,5672,25672 -m comment --comment "109 rabbitmq" -m state --state NEW -j ACCEPT
 
 Alternatively it's possible to get the information in tripleo service in the
-definition. In our case in `puppet/services/rabbitmq.yaml`::
+definition. In our case in `deployment/rabbitmq/rabbitmq-container-puppet.yaml`::
 
     tripleo.rabbitmq.firewall_rules:
       '109 rabbitmq':
@@ -351,7 +351,7 @@ entries to the `/etc/securetty` file.
 An environment file can be used to set `/etc/securetty` entries as follows::
 
   resource_registry:
-    OS::TripleO::Services::Securetty: ../puppet/services/securetty.yaml
+    OS::TripleO::Services::Securetty: ../deployment/securetty/securetty-baremetal-puppet.yaml
 
   parameter_defaults:
     TtyValues:
@@ -378,7 +378,7 @@ Entries can be made to `/etc/login.defs` to enforce password characteristics
 for new users added to the system, for example::
 
   resource_registry:
-    OS::TripleO::Services::LoginDefs: ../puppet/services/login-defs.yaml
+    OS::TripleO::Services::LoginDefs: ../deployment/login-defs/login-defs-baremetal-puppet.yaml
 
   parameter_defaults:
     PasswordMaxDays: 60

doc/source/install/containers_deployment/architecture.rst

@@ -160,9 +160,8 @@ Each service may define output variable(s) which control config file generation,
 initialization, and stepwise deployment of all the containers for this service.
 The following sections are available:
 
-* config_settings: This setting is generally inherited from the
+* config_settings: This setting containers hiera data that is used
-  puppet/services templates and may be appended to if required
+  to control how the Puppet modules generate config files for each service.
-  to support the docker specific config settings.
 
 * step_config: This setting controls the manifest that is used to
   create docker config files via puppet. The puppet tags below are

doc/source/upgrade/fast_forward_upgrade.rst

@@ -887,17 +887,6 @@ For DPDK environments:
      resource_registry:
        OS::TripleO::Services::ComputeNeutronOvsDpdk: ../docker/services/neutron-ovs-dpdk-agent.yaml
 
-   And remove the previous entry:
-
-   ::
-
-     resource_registry:
-       OS::TripleO::Services::ComputeNeutronOvsAgent: ../puppet/services/neutron-ovs-dpdk-agent.yaml
-
-   Please notice the naming change between `ComputeNeutronOvsAgent` and
-   `ComputeNeutronOvsDpdk`.
-
-
 For SR-IOV environments:
 
 1. In the resource registry section, override the NeutronSriovAgent service
@@ -907,10 +896,3 @@ For SR-IOV environments:
 
      resource_registry:
        OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml
-
-   And remove the previous entry:
-
-   ::
-
-     resource_registry:
-       OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml