Commit ab3556f9 authored by Michael Kennedy's avatar Michael Kennedy 🎱
Browse files

updates to output.tf and additional

parent 6cc9abd8
Loading
Loading
Loading
Loading
+30 −14
Original line number Diff line number Diff line
@@ -2,15 +2,14 @@
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="6d8b47de-bd76-4775-9001-e9d1327eafc5" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/outputs.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/bigip/as3.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/bigip/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/bigip/main.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/bigip/outputs.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/bigip/outputs.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/secure/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/secure/main.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/secure/outputs.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/secure/outputs.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/docker/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/docker/main.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/hostvars_template.yml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/main.tf" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/vars.tf" beforeDir="false" afterPath="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/jumpbox/vars.tf" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -28,6 +27,11 @@
  </component>
  <component name="ProjectId" id="1Tp4fzlepTFx9pfppikgRV1P6xM" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showExcludedFiles" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -38,15 +42,20 @@
    <property name="node.js.selected.package.eslint" value="(autodetect)" />
    <property name="node.js.selected.package.tslint" value="(autodetect)" />
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
  <component name="RecentsManager">
    <key name="MoveFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/terraform/f5-sgw-ts/modules/functions/docker/files" />
    </key>
  </component>
  <component name="ServiceViewManager">
    <option name="viewStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
        <serviceView>
          <treeState>
            <expand />
            <select />
          </treeState>
        </serviceView>
      </list>
    </option>
  </component>
@@ -67,7 +76,8 @@
      <workItem from="1574294818299" duration="45000" />
      <workItem from="1574294891425" duration="13680000" />
      <workItem from="1574922245790" duration="1009000" />
      <workItem from="1574988736439" duration="869000" />
      <workItem from="1574988736439" duration="13109000" />
      <workItem from="1575411461731" duration="191000" />
    </task>
    <servers />
  </component>
@@ -87,4 +97,10 @@
      </map>
    </option>
  </component>
  <component name="WindowStateProjectService">
    <state x="653" y="383" key="com.intellij.ide.util.TipDialog" timestamp="1575411543681">
      <screen x="0" y="23" width="1920" height="1057" />
    </state>
    <state x="653" y="383" key="com.intellij.ide.util.TipDialog/-1920.23.1920.1057/0.23.1920.1057/-3600.23.1680.1027@0.23.1920.1057" timestamp="1575411543681" />
  </component>
</project>
 No newline at end of file
+0 −7
Original line number Diff line number Diff line

#
# Create random password for BIG-IP
#
@@ -7,7 +6,6 @@ resource "random_password" "password" {
  special          = true
  override_special = "_%@"
}

#
# Create Secret Store and Store BIG-IP Password
#
@@ -18,7 +16,6 @@ resource "aws_secretsmanager_secret_version" "bigip-pwd" {
  secret_id     = aws_secretsmanager_secret.bigip.id
  secret_string = random_password.password.result
}

#
# Create the BIG-IP appliances
#
@@ -55,13 +52,10 @@ module "bigip" {
    module.bigip_mgmt_sg.this_security_group_id
  ]


  vpc_public_subnet_ids  = var.public_subnets
  vpc_private_subnet_ids = var.private_subnets
  vpc_mgmt_subnet_ids    = var.database_subnets
}


#
# Create a security group for BIG-IP
#
@@ -86,7 +80,6 @@ module "bigip_sg" {
  egress_cidr_blocks = ["0.0.0.0/0"]
  egress_rules       = ["all-all"]
}

#
# Create a security group for BIG-IP Management
#
+5 −2
Original line number Diff line number Diff line
@@ -2,14 +2,17 @@ output "public_nic_ids" {
  value = module.bigip.public_nic_ids
}

output "mgmt_addresses" {
  value = module.bigip.mgmt_addresses
output "mgmt_public_ips" {
  value = module.bigip.mgmt_public_ips
}

output "mgmt_public_dns" {
  value = module.bigip.mgmt_public_dns
}

output "mgmt_addresses" {
  value = module.bigip.mgmt_addresses
}
output "private_addresses" {
  value = module.bigip.private_addresses
}
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ module "dockerhost" {
  subnet_ids                  = var.private_subnets


  user_data = templatefile("${path.module}/userdata.tmpl", {})
  user_data = templatefile("${path.module}/files/userdata.tmpl", {})

  tags = {
    Terraform   = "true"
+34 −0
Original line number Diff line number Diff line
all:
  vars:
    app_server_address: "${appserver_guest_ip}" # an ip address that will be assigned to a nic created by ansible
    app_server_address: "${appserver_guest_ip}" # an address that is assigned to the juice shop and grafana virtual server pool members. If the add_ubuntu_interface variable is set to true, this address will also be assigned to the eth1 interface of the Ubuntu server

  children:
    servers:
      hosts:
        ${appserver_guest_ip}:
          ansible_connection: ssh
          ansible_user: "${ec2_username}"
          ansible_become: yes
          ansible_ssh_private_key_file: "~/${ec2_key_name}.pem"
          ansible_connection: ssh # connection type used when connecting to the Ubuntu host
          ansible_user: "${ec2_username}" # user name with which to login to the Ubuntu server via ssh
          ansible_become: true # determines if privilege escalation is used while issuing Ansible tasks on the Ubuntu server
          ansible_ssh_private_key_file: "~/${ec2_key_name}.pem" # path to private key file to use for ssh authentication
          add_ubuntu_interface: false # boolean to add an optional network interface (eth1) to the Ubuntu server using the NetPlan role
          app_server_gateway: "${appserver_gateway_ip}" 

    big_ips:
      hosts:
        ${bigip_host_ip}: # the ip address or hostname of the BIG-IP management endpoint
          bigip_provider:
            server: "{{ inventory_hostname }}"
            server: "{{ inventory_hostname }}" # the ip address or hostname of the BIG-IP management endpoint. defaults to inventory_hostname
            user: "${bigip_username}" # the username that will be used to access the BIG-IP management endpoint
            password: "${bigip_password}" # the password that will be used to access the BIG-IP management endpoint
            validate_certs: false # since these boxes are assumed to have self-signed certs validatation is disabled
@@ -26,8 +27,8 @@ all:
          bigip_ntp_timezone: "America/Los_Angeles" # the timezone should be reconciled with the AWS region within which the BIG-IP is built
          bigip_dns_server: "\"${bigip_dns_server}\"" # a list of DNS servers to configure the BIG-IP for name resolution
          bigip_dns_search: "\"{{ bigip_domain }}\"" # internal DNS search domain
          bigip_external_self_ip: "${bigip_external_self_ip}/24" # the external 
          bigip_internal_self_ip: "${bigip_internal_self_ip}/24"
          juiceshop_virtual_address: "${juiceshop_virtual_ip}"
          grafana_virtual_address: "${grafana_virtual_ip}"
          log_pool: "${log_pool}"
          bigip_external_self_ip: "${bigip_external_self_ip}/24" # the ip address of the BIG-IP's self-ip on the external subnet
          bigip_internal_self_ip: "${bigip_internal_self_ip}/24" # the ip address of the BIG-IP's self-ip on the internal subnet
          juiceshop_virtual_address: "${juiceshop_virtual_ip}" # the ip address that will become the listener (virtual server) of the juice shop application
          grafana_virtual_address: "${grafana_virtual_ip}" # the ip address that will become the listener (virtual server) of the grafana application
          log_pool: "${log_pool}" # the ip address of the virtual server and looging pool that the LTM Request Policy and ASM Logs can target
Loading