(SOLARCH-376) changing the role to puppet/server to avoid confusion with primary and replica

Author: davidsandilands

documentation/recovery.md

@@ -26,7 +26,7 @@ This procedure uses the following placeholder references.
         curl -k https://<primary-server-fqdn>:8140/packages/current/install.bash \
           | bash -s -- \
               main:certname=<replacement-replica-fqdn> \
-              extension_requests:1.3.6.1.4.1.34380.1.1.9812=puppet/primary \
+              extension_requests:1.3.6.1.4.1.34380.1.1.9812=puppet/server \
               extension_requests:1.3.6.1.4.1.34380.1.1.9813=<replacement-avail-group-letter>
 
         puppet agent -t

manifests/setup/node_manager.pp

@@ -97,7 +97,7 @@
     ensure => present,
     parent => 'PE Infrastructure',
     rule   => ['and',
-      ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/primary'],
+      ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/server'],
       ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
     ],
     data   => {
@@ -153,7 +153,7 @@
       ensure => present,
       parent => 'PE Infrastructure',
       rule   => ['and',
-        ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/primary'],
+        ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/server'],
         ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
       ],
       data   => {

plans/action/install.pp

@@ -212,7 +212,7 @@
     if ($target in $primary_target) {
       run_plan('peadm::util::insert_csr_extension_requests', $target,
         extension_requests => {
-          peadm::oid('peadm_role')               => 'puppet/primary',
+          peadm::oid('peadm_role')               => 'puppet/server',
           peadm::oid('peadm_availability_group') => 'A'
         }
       )
@@ -340,7 +340,7 @@
       run_task('peadm::agent_install', $target,
         server        => $primary_target.peadm::target_name(),
         install_flags => $common_install_flags + [
-          "extension_requests:${peadm::oid('peadm_role')}=puppet/primary",
+          "extension_requests:${peadm::oid('peadm_role')}=puppet/server",
           "extension_requests:${peadm::oid('peadm_availability_group')}=B",
         ],
       )

plans/convert.pp

@@ -132,7 +132,7 @@
     run_plan('peadm::util::add_cert_extensions', $primary_target,
       primary_host => $primary_target,
       extensions  => {
-        peadm::oid('peadm_role')               => 'puppet/primary',
+        peadm::oid('peadm_role')               => 'puppet/server',
         peadm::oid('peadm_availability_group') => 'A',
       },
     )
@@ -150,7 +150,7 @@
     run_plan('peadm::util::add_cert_extensions', $primary_replica_target,
       primary_host => $primary_target,
       extensions  => {
-        peadm::oid('peadm_role')               => 'puppet/primary',
+        peadm::oid('peadm_role')               => 'puppet/server',
         peadm::oid('peadm_availability_group') => 'B',
       },
     )