Cleaning up of linklight deployer

Tok

2018-07-26 1db6664be547aec13b1b9a3a268d381b14776e0b

Cleaning up of linklight deployer

 ansible/configs/linklight/README-new.adoc

File was deleted

 ansible/configs/linklight/README.adoc

@@ -61,21 +61,21 @@
    username: tok
    email: tok@redhat.com

# Multi user example
#USERS='{"users":[{ "name": "Alice", "username": "alice", "email": "alice@example.com" }, { "name": "Bob", "username":"bob", "email": "bob@example.com" }]}'
#REPO_PATH='https://admin.example.com/repos/ocp/3.6/'
#        -e "repo_method=file" -e "own_repo_path=${REPO_PATH}" -e "repo_version=${REPO_VERSION}" \
   #     -e ${USERS} \

REGION=us-east-1
AVAILABILITYZONE=us-east-1a
EC2NAMEPREFIX=lightbulb
REGION=ap-southeast-2
AVAILABILITYZONE=ap-southeast-2a
EC2NAMEPREFIX=abcd
KEYNAME=ocpkey
GUID=lightbulb
ENVTYPE=lightbulb
GUID=abcd
ENVTYPE=linklight
ADMINPASSWORD=lightbulb
EMAILUSERS=no
USERS='{"users":[{ "name": "tony", "username": "tok", "email": "tok$redhat.com"
}]}'
CLOUDPROVIDER=ec2
HOSTZONEID='Z3IHLWJZOU9SRT'
CLOUDPROVIDER=none
#HOSTZONEID='Z3IHLWJZOU9SRT'

BASESUFFIX='.example.opentlc.com'
DEPLOYER_REPO_PATH=`pwd`
@@ -89,7 +89,6 @@
        -e "ec2_name_prefix=${EC2NAMEPREFIX}" \
        -e "admin_password=${ADMINPASSWORD}" \
        -e "email=${EMAILUSERS}" \
        -e ${USERS} \
        -e "guid=${GUID}" \
        -e "env_type=${ENVTYPE}" \
        -e "key_name=${KEYNAME}" \
@@ -98,10 +97,12 @@
        -e "aws_region=${REGION}" \
        -e "HostedZoneId=${HOSTZONEID}" \
        -e "install_ipa_client=false" \
        -e "repo_method=file" -e "own_repo_path=${REPO_PATH}" -e "repo_version=${REPO_VERSION}" \
        -e "software_to_deploy=none" \
        --skip-tags=deploy_infrastructure,post_infra_tasks,pre_software_tasks,deploy_software,post_software,email




----

=== To Delete an environment

 ansible/configs/linklight/env_vars.yml

@@ -12,16 +12,17 @@

###### Variables from the Ansible Lightbulb AWS Provisioner:


ec2_key_name: ocpkey            # SSH key in AWS to put in all the instances
ec2_key_name: toktest            # SSH key in AWS to put in all the instances
ec2_region: us-east-1           # region where the nodes will live
ec2_az: us-east-1a              # the availability zone
ec2_name_prefix: "{{ guid }}"   # name prefix for all the VMs

student_total: 2                                # amount of work benches to provision

#networking: true                                # workshop is put into networking mode, uses two Cisco IOS-XE devices

## Optional Variables
#networking: true                                # workshop is put into networking mode, uses two Cisco IOS-XE devices

admin_password: ansible                    # password used for student account on control node
localsecurity: false            # skips firewalld installation and SE Linux when false
create_login_page: false
@@ -39,8 +40,11 @@
## set `set_env_authorized_key` to true and set the keyname in `env_authorized_key`
## you can use the key used to create the environment or use your own self generated key
## if you set "use_own_key" to false your PRIVATE key will be copied to the bastion. (This is {{key_name}})

use_own_key: true
env_authorized_key: "{{guid}}key"
set_env_authorized_key: true

##ansible_ssh_private_key_file: ~/.ssh/{{key_name}}.pem
#<<<<<<< HEAD
#
@@ -52,5 +56,4 @@
#ansible_ssh_private_key_file: ~/.ssh/{{key_name}}.pem
#>>>>>>> 97e92d3972791ab798a7768c7de6cd2e814481d4

set_env_authorized_key: true


 ansible/configs/linklight/pre_infra.yml

@@ -15,22 +15,22 @@
  - debug:
      msg: "Step 000 Pre Infrastructure"

  - name: Generate SSH keys
    shell: ssh-keygen -b 2048 -t rsa -f "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}" -q -N ""
    args:
      creates: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}"
    when: set_env_authorized_key
  - name: Generate SSH keys when set_env_authorized_key 
    block:
    - name: Generate SSH keys
      shell: ssh-keygen -b 2048 -t rsa -f "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}" -q -N ""
      args:
        creates: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}"

  - name: fix permission
    file:
      path: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}"
      mode: 0400
    when: set_env_authorized_key
    - name: fix permission
      file:
        path: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}"
        mode: 0400

  - name: Generate SSH pub key
    shell: ssh-keygen -y -f "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}" > "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}.pub"
    args:
      creates: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}.pub"
    - name: Generate SSH pub key
      shell: ssh-keygen -y -f "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}" > "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}.pub"
      args:
        creates: "{{ ANSIBLE_REPO_PATH }}/workdir/{{ env_authorized_key }}.pub"
    when: set_env_authorized_key

    # tested version on 2018-07-24 fc86de92080165b72906a1477e389cf0298bd499