Use ternary operator to decide public/private subnet assignment

• Remove extraneous code after refactor
• Also, include openshift_clusterid in EC2 tag (vs hardcoded cicd-pipeline).

@darachch @chris.kuperstein

Closes #13 (closed)