Containerized installation

reference-architecture/aws-ansible/README.md

@@ -58,6 +58,9 @@ The default region is us-east-1 but can be changed when running the ose-on-aws s
 ### AMI ID
 The AMI ID may need to change if the AWS IAM account does not have access to the Red Hat Cloud Access gold image or if deploying outside of the us-east-1 region.
 
+### Containerized Installation
+The option to install OpenShift in containers is possible by providing the trigger --containerized=true.
+
 ### New AWS Environment (Greenfield)
 When installing into an new AWS environment perform the following.   This will create the SSH key, bastion host, and VPC for the new environment.
 ```

reference-architecture/aws-ansible/add-node.py

@@ -37,6 +37,8 @@
 @click.option('--rhsm-pool', help='Red Hat Subscription Management Pool ID or Subscription Name')
 
 ### Miscellaneous options
+@click.option('--containerized', default='False', help='Containerized installation of OpenShift',
+              show_default=True)
 @click.option('--iam-role', help='Specify the name of the existing IAM Instance profile',
               show_default=True)
 @click.option('--shortname', help='Specify the hostname of the sytem',
@@ -70,6 +72,7 @@ def launch_refarch_env(region=None,
                     rhsm_user=None,
                     rhsm_password=None,
                     rhsm_pool=None,
+                    containerized=None,
                     node_type=None,
                     iam_role=None,
                     infra_elb_name=None,
@@ -141,6 +144,7 @@ def launch_refarch_env(region=None,
   click.echo('\trhsm_user: %s' % rhsm_user)
   click.echo('\trhsm_password: *******')
   click.echo('\trhsm_pool: %s' % rhsm_pool)
+  click.echo('\tcontainerized: %s' % containerized)
   click.echo('\tnode_type: %s' % node_type)
   click.echo('\tiam_role: %s' % iam_role)
   click.echo('\tinfra_elb_name: %s' % infra_elb_name)
@@ -187,6 +191,7 @@ def launch_refarch_env(region=None,
     rhsm_user=%s \
     rhsm_password=%s \
     rhsm_pool=%s \
+    containerized=%s \
     node_type=%s \
     iam_role=%s \
     infra_elb_name=%s \' %s' % (region,
@@ -205,6 +210,7 @@ def launch_refarch_env(region=None,
                     rhsm_user,
                     rhsm_password,
                     rhsm_pool,
+                    containerized,
                     node_type,
                     iam_role,
                     infra_elb_name,

reference-architecture/aws-ansible/ose-on-aws.py

@@ -61,6 +61,8 @@
               show_default=True)
 @click.option('--bastion-sg', default='/dev/null', help='Specify Bastion Security group used with byo-bastion',
               show_default=True)
+@click.option('--containerized', default='False', help='Containerized installation of OpenShift',
+              show_default=True)
 @click.option('--no-confirm', is_flag=True,
               help='Skip confirmation prompt')
 @click.help_option('--help', '-h')
@@ -91,6 +93,7 @@ def launch_refarch_env(region=None,
                     rhsm_user=None,
                     rhsm_password=None,
                     rhsm_pool=None,
+                    containerized=None,
                     verbose=0):
 
   # Need to prompt for the R53 zone:
@@ -167,6 +170,7 @@ def launch_refarch_env(region=None,
   click.echo('\trhsm_user: %s' % rhsm_user)
   click.echo('\trhsm_password: *******')
   click.echo('\trhsm_pool: %s' % rhsm_pool)
+  click.echo('\tcontainerized: %s' % containerized)
   click.echo("")
 
   if not no_confirm:
@@ -214,7 +218,8 @@ def launch_refarch_env(region=None,
     deployment_type=%s \
     rhsm_user=%s \
     rhsm_password=%s \
-    rhsm_pool=%s \' %s' % (region,
+    rhsm_pool=%s \
+    containerized=%s \' %s' % (region,
                     ami,
                     keypair,
                     create_key,
@@ -238,6 +243,7 @@ def launch_refarch_env(region=None,
                     rhsm_user,
                     rhsm_password,
                     rhsm_pool,
+                    containerized,
                     playbook)
 
     if verbose > 0:

reference-architecture/aws-ansible/playbooks/add-node.yaml

@@ -26,7 +26,6 @@
       - vars/main.yaml
   roles:
       - rhsm-repos
-      - prerequisites
 
 - include: node-setup.yaml
 
@@ -38,14 +37,6 @@
   roles:
       - infra-node-scaleup
 
-- hosts: new_nodes
-  gather_facts: no
-  become: yes
-  vars_files:
-      - vars/main.yaml
-  roles:
-      - openshift-emptydir-quota
-
 - hosts: localhost
   connection: local
   gather_facts: no

reference-architecture/aws-ansible/playbooks/node-setup.yaml

@@ -23,6 +23,7 @@
     openshift_router_selector: "role=infra"
     openshift_hosted_router_replicas: 2
     openshift_hosted_registry_replicas: 2
+    openshift_node_local_quota_per_fsgroup: 512Mi
     openshift_master_cluster_method: native
     openshift_cloudprovider_kind: aws
     openshift_master_cluster_hostname: "internal-openshift-master.{{ public_hosted_zone }}"

reference-architecture/aws-ansible/playbooks/openshift-install.yaml

@@ -35,7 +35,6 @@
       - vars/main.yaml
   roles:
       - rhsm-repos
-      - prerequisites
 
 - include: openshift-setup.yaml
 
@@ -49,14 +48,6 @@
       - s3-registry-user
       - s3-registry-bucket
 
-- hosts: schedulable_nodes
-  gather_facts: no
-  become: yes
-  vars_files:
-      - vars/main.yaml
-  roles:
-      - openshift-emptydir-quota
-
 - hosts: primary_master
   gather_facts: no 
   become: yes

reference-architecture/aws-ansible/playbooks/openshift-setup.yaml

@@ -24,6 +24,7 @@
     openshift_hosted_router_replicas: 2
     openshift_hosted_registry_replicas: 2
     openshift_master_cluster_method: native
+    openshift_node_local_quota_per_fsgroup: 512Mi
     openshift_cloudprovider_kind: aws
     openshift_master_cluster_hostname: "internal-openshift-master.{{ public_hosted_zone }}"
     openshift_master_cluster_public_hostname: "openshift-master.{{ public_hosted_zone }}"

reference-architecture/aws-ansible/playbooks/roles/cloudformation-infra/files/brownfield-byo-bastion.json

@@ -51,10 +51,18 @@
       "Type": "String",
       "Default": "25"
     },
+    "MasterEmptyVolSize": {
+      "Type": "String",
+      "Default": "5"
+    },
     "MasterEtcdVolType": {
       "Type": "String",
       "Default": "gp2"
     },
+    "MasterEmptyVolType": {
+      "Type": "String",
+      "Default": "gp2"
+    },
     "MasterDockerVolType": {
       "Type": "String",
       "Default": "gp2"
@@ -727,6 +735,15 @@
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
           }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
+          }
          ]
      }
   },
@@ -772,6 +789,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }
@@ -818,6 +843,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }

reference-architecture/aws-ansible/playbooks/roles/cloudformation-infra/files/brownfield.json

@@ -63,10 +63,18 @@
       "Type": "String",
       "Default": "25"
     },
+    "MasterEmptyVolSize": {
+      "Type": "String",
+      "Default": "5"
+    },
     "MasterEtcdVolType": {
       "Type": "String",
       "Default": "gp2"
     },
+    "MasterEmptyVolType": {
+      "Type": "String",
+      "Default": "gp2"
+    },
     "MasterUserData": {
       "Type": "String"
     },
@@ -801,6 +809,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }
@@ -847,6 +863,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }
@@ -893,6 +917,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }

reference-architecture/aws-ansible/playbooks/roles/cloudformation-infra/files/greenfield.json

@@ -75,13 +75,21 @@
       "Type": "String",
       "Default": "25"
     },
+    "MasterEmptyVolSize": {
+      "Type": "String",
+      "Default": "5"
+    },
     "MasterUserData": {
       "Type": "String"
     },
     "MasterEtcdVolType": {
       "Type": "String",
       "Default": "gp2"
     },
+    "MasterEmptyVolType": {
+      "Type": "String",
+      "Default": "gp2"
+    },
     "MasterDockerVolType": {
       "Type": "String",
       "Default": "gp2"
@@ -999,6 +1007,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }
@@ -1046,6 +1062,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }
@@ -1093,6 +1117,14 @@
               "VolumeSize": {"Ref": "MasterEtcdVolSize"},
               "VolumeType": {"Ref": "MasterEtcdVolType"}
             }
+          },
+          {
+            "DeviceName": "/dev/xvdd",
+            "Ebs": {
+              "DeleteOnTermination": "false",
+              "VolumeSize": {"Ref": "MasterEmptyVolSize"},
+              "VolumeType": {"Ref": "MasterEmptyVolType"}
+            }
           }
          ]
      }