more renaming and layout

Author: timidri

plans/action/configure.pp

@@ -21,7 +21,7 @@
   Optional[TargetSpec]              $compiler_hosts = undef,
 
   # Extra Large
-  Optional[Peadm::SingleTargetSpec] $primary_postgresql_host         = undef,
+  Optional[Peadm::SingleTargetSpec] $primary_postgresql_host = undef,
   Optional[Peadm::SingleTargetSpec] $replica_postgresql_host = undef,
 
   # Common Configuration
@@ -92,13 +92,13 @@
   if $arch['disaster-recovery'] {
     # Run the PE Replica Provision
     run_task('peadm::provision_replica', $primary_target,
-      primary_replica => $replica_target.peadm::certname(),
-      token_file      => $token_file,
+      replica    => $replica_target.peadm::certname(),
+      token_file => $token_file,
 
       # Race condition, where the provision command checks PuppetDB status and
       # probably gets "starting", but fails out because that's not "running".
       # Can remove flag when that issue is fixed.
-      legacy          => true,
+      legacy     => true,
     )
   }
 

tasks/enable_replica.json

@@ -1,7 +1,7 @@
 {
   "description": "Execute the enable replica puppet command ",
   "parameters": {
-    "primary_replica": {
+    "replica": {
       "type": "String",
       "description": "The name of the replica to enable"
     },

tasks/enable_replica.sh

@@ -14,7 +14,7 @@ set -e
 env PATH="/opt/puppetlabs/bin:${PATH}" \
     USER="$USER" \
     HOME="$HOME" \
-    puppet infrastructure enable replica "$PT_primary_replica" \
+    puppet infrastructure enable replica "$PT_replica" \
       --skip-agent-config \
       --topology mono-with-compile \
       --yes --token-file "$TOKEN_FILE"

tasks/provision_replica.json

@@ -1,7 +1,7 @@
 {
   "description": "Execute the replica provision puppet command ",
   "parameters": {
-    "primary_replica": {
+    "replica": {
       "type": "String",
       "description": "The name of the replica to provision"
     },

tasks/provision_replica.sh

@@ -14,17 +14,17 @@ fi
 set -e
 
 if [ "$PT_legacy" = "false" ]; then
-  puppet infrastructure provision replica "$PT_primary_replica" \
+  puppet infrastructure provision replica "$PT_replica" \
     --yes --token-file "$TOKEN_FILE" \
     --skip-agent-config \
     --topology mono-with-compile \
     --enable
 
 elif [ "$PT_legacy" = "true" ]; then
-  puppet infrastructure provision replica "$PT_primary_replica" \
+  puppet infrastructure provision replica "$PT_replica" \
     --token-file "$TOKEN_FILE"
 
-  puppet infrastructure enable replica "$PT_primary_replica" \
+  puppet infrastructure enable replica "$PT_replica" \
     --yes --token-file "$TOKEN_FILE" \
     --skip-agent-config \
     --topology mono-with-compile