RubyGems - fhcap-cli - Versions diffs - 0.4.9 → 0.4.10 - Mend

fhcap-cli 0.4.9 → 0.4.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (42) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +13 -0
data/Dockerfile +37 -0
data/entrypoint.sh +11 -0
data/fhcap-cli.gemspec +9 -4
data/lib/cookbooks/provision/libraries/provision.rb +16 -2
data/lib/cookbooks/provision/recipes/ssh.rb +25 -0
data/lib/cookbooks/provision/recipes/ssh_cluster_create.rb +4 -0
data/lib/cookbooks/provision/recipes/ssh_cluster_destroy.rb +4 -0
data/lib/extensions/thor/actions.rb +33 -0
data/lib/fhcap.rb +2 -2
data/lib/fhcap/dns.rb +3 -3
data/lib/fhcap/kitchen.rb +65 -16
data/lib/fhcap/knife_helper.rb +1 -2
data/lib/fhcap/providers_helper.rb +1 -0
data/lib/fhcap/repos_helper.rb +1 -1
data/lib/fhcap/tasks/chef/cookbook/update_config.rb +0 -1
data/lib/fhcap/tasks/dns/aws/create_record.rb +81 -0
data/lib/fhcap/tasks/dns/aws/delete_record.rb +57 -0
data/lib/fhcap/tasks/dns/aws/list_records.rb +34 -0
data/lib/fhcap/tasks/dns/{route53_helper.rb → aws/route53_helper.rb} +1 -1
data/lib/fhcap/tasks/dns/create_record.rb +5 -67
data/lib/fhcap/tasks/dns/delete_record.rb +5 -43
data/lib/fhcap/tasks/dns/list_records.rb +25 -0
data/lib/fhcap/thor_base.rb +5 -0
data/lib/fhcap/version.rb +1 -1
data/spec/fhcap/tasks/dns/{create_record_spec.rb → aws/create_record_spec.rb} +4 -4
data/spec/fhcap/tasks/dns/{delete_record_spec.rb → aws/delete_record_spec.rb} +4 -4
data/templates/chef/environment_mbaas.json.erb +32 -2
data/templates/chef/environment_single.json.erb +8 -0
data/templates/cluster/aws/farm-5node.json.erb +245 -0
data/templates/cluster/farm-5node.json.erb +8 -0
data/templates/cluster/openstack/farm-5node.json.erb +20 -0
data/templates/kitchen/Dockerfile-rhel +23 -0
data/templates/kitchen/Vagrantfile-osx.rb +10 -0
data/templates/kitchen/docker_id_rsa +27 -0
data/templates/kitchen/docker_id_rsa.pub +1 -0
data/templates/kitchen/kitchen.aws.yml.erb +37 -14
data/templates/kitchen/kitchen.docker.yml.erb +34 -1
data/templates/kitchen/kitchen.vagrant.yml.erb +39 -3
metadata +86 -14
data/lib/fhcap/tasks/dns/list.rb +0 -37

data/templates/chef/environment_single.json.erb CHANGED

@@ -18,6 +18,9 @@ end
   "json_class": "Chef::Environment",
   "chef_type": "environment",
   "default_attributes": {
+    "fh-openshift-templates": {
+      "use-rhmap-artifact": false
+    },
     "apache2": {
       "buildfarm": {
         "android": {
@@ -53,6 +56,11 @@ end
     "feedhenry_galera": {
       "safe-updates": false
     },
+    "feedhenry_dynovm": {
+      "bind9": {
+        "cache_enabled": false
+      }
+    },
     "fh-aaa": {
       "conf": {
         "fhaaa": {

data/templates/cluster/aws/farm-5node.json.erb ADDED

@@ -0,0 +1,245 @@
+{
+  "domain": "<%= config[:domain] %>",
+  "subnets": {
+    "1a": {
+      "cidr": "0/26",
+      "availability_zone": "1a"
+    },
+    "1b": {
+      "cidr": "64/26",
+      "availability_zone": "1b"
+    },
+    "1c": {
+      "cidr": "128/26",
+      "availability_zone": "1c"
+    }
+  },
+  "security_groups": {
+    "<%= config[:environment_name] %>-builder-lb": {
+      "authorize_ingress": [
+        {
+          "protocols": ["tcp"],
+          "start": 443,
+          "end": 443,
+          "sources": ["0.0.0.0/0"]
+        },
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "sources": ["0.0.0.0/0"]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>-digman": {
+      "authorize_ingress": [
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "groups": ["<%= config[:environment_name] %>-builder-lb"]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>-linux": {
+      "authorize_ingress": [
+        {
+          "protocols": ["tcp"],
+          "start": 0,
+          "end": 65535,
+          "groups": ["<%= config[:environment_name] %>-digman"]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>": {
+      "authorize_ingress": [
+        {
+          "protocols": ["tcp"],
+          "start": 0,
+          "end": 65535,
+          "groups": [
+            "<%= config[:environment_name] %>",
+            "<%= config[:environment_name] %>-digman",
+            "<%= config[:environment_name] %>-linux"
+          ]
+        },
+        {
+          "protocols": ["icmp"],
+          "start": -1,
+          "end": -1,
+          "groups": [
+            "<%= config[:environment_name] %>",
+            "<%= config[:environment_name] %>-digman",
+            "<%= config[:environment_name] %>-linux"
+          ]
+        }
+      ]
+    }
+  },
+  "load_balancers": {
+    "digman": {
+      "security_groups": ["<%= config[:environment_name] %>-builder-lb"],
+      "subnets": ["1a", "1b", "1c"],
+      "scheme": "internet-facing",
+      "listeners": [
+        {
+          "port": 80,
+          "protocol": "http",
+          "instance_port": 80,
+          "instance_protocol": "http"
+        }
+      ]
+    }
+  },
+  "instances": {
+    "linux1": {
+      "aws": {
+        "image_id": "CENTOS7-IMAGE-ID",
+        "security_groups": ["ops-admin", "<%= config[:environment_name] %>", "<%= config[:environment_name] %>-linux"],
+        "private_ip_address": "",
+        "subnet": "1a",
+        "block_device_mappings": [
+          {
+            "device_name": "/dev/sda1",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true
+            }
+          },
+          {
+            "device_name": "/dev/sdb",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true,
+              "encrypted": true
+            }
+          }
+        ]
+      },
+      "machine_options": {
+        "ssh_username": "ec2-user",
+        "convergence_options": {
+          "chef_version": "12.15.19"
+        }
+      },
+      "load_balancers": [],
+      "run_list": ["role[mount_data_volumes]", "role[fh-digger]", "recipe[feedhenry_common::fhctl]"]
+    },
+    "linux2": {
+      "aws": {
+        "image_id": "CENTOS7-IMAGE-ID",
+        "security_groups": ["ops-admin", "<%= config[:environment_name] %>", "<%= config[:environment_name] %>-linux"],
+        "private_ip_address": "",
+        "subnet": "1b",
+        "block_device_mappings": [
+          {
+            "device_name": "/dev/sda1",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true
+            }
+          },
+          {
+            "device_name": "/dev/sdb",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true,
+              "encrypted": true
+            }
+          }
+        ]
+      },
+      "machine_options": {
+        "ssh_username": "ec2-user",
+        "convergence_options": {
+          "chef_version": "12.15.19"
+        }
+      },
+      "load_balancers": [],
+      "run_list": ["role[mount_data_volumes]", "role[fh-digger]", "recipe[feedhenry_common::fhctl]"]
+    },
+    "digman1": {
+      "aws": {
+        "image_id": "CENTOS7-IMAGE-ID",
+        "security_groups": ["ops-admin", "<%= config[:environment_name] %>", "<%= config[:environment_name] %>-digman"],
+        "private_ip_address": "",
+        "subnet": "1a",
+        "block_device_mappings": [
+          {
+            "device_name": "/dev/sda1",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true
+            }
+          }
+        ]
+      },
+      "machine_options": {
+        "ssh_username": "ec2-user",
+        "convergence_options": {
+          "chef_version": "12.15.19"
+        }
+      },
+      "load_balancers": ["digman"],
+      "run_list": ["role[fh-digman]"]
+    },
+    "digman2": {
+      "aws": {
+        "image_id": "CENTOS7-IMAGE-ID",
+        "security_groups": ["ops-admin", "<%= config[:environment_name] %>", "<%= config[:environment_name] %>-digman"],
+        "private_ip_address": "",
+        "subnet": "1b",
+        "block_device_mappings": [
+          {
+            "device_name": "/dev/sda1",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true
+            }
+          }
+        ]
+      },
+      "machine_options": {
+        "ssh_username": "ec2-user",
+        "convergence_options": {
+          "chef_version": "12.15.19"
+        }
+      },
+      "load_balancers": ["digman"],
+      "run_list": ["role[fh-digman]"]
+    },
+    "mgt1": {
+      "aws": {
+        "security_groups": ["ops-admin", "<%= config[:environment_name] %>"],
+        "private_ip_address": "",
+        "subnet": "1c",
+        "block_device_mappings": [
+          {
+            "device_name": "/dev/sda1",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true
+            }
+          },
+          {
+            "device_name": "/dev/sdb",
+            "ebs": {
+              "volume_size": 40,
+              "volume_type": "gp2",
+              "delete_on_termination": true,
+              "encrypted": true
+            }
+          }
+        ]
+      },
+      "run_list": ["role[management_server]"]
+    }
+  }
+}

data/templates/cluster/farm-5node.json.erb ADDED

@@ -0,0 +1,8 @@
+{
+  "environments": [
+    {
+      "name": "farm",
+      "template": "farm-5node"
+    }
+  ]
+}

data/templates/cluster/openstack/farm-5node.json.erb ADDED

@@ -0,0 +1,20 @@
+{
+  "domain": "<%= config[:domain] %>",
+  "instances": {
+    "linux1": {
+      "run_list": ["role[fh-digger]", "recipe[feedhenry_common::fhctl]"]
+    },
+    "linux2": {
+      "run_list": ["role[fh-digger]", "recipe[feedhenry_common::fhctl]"]
+    },
+    "digman1": {
+      "run_list": ["role[fh-digman]"]
+    },
+    "digman2": {
+      "run_list": ["role[fh-digman]"]
+    },
+    "mgt1": {
+      "run_list": ["role[management_server]"]
+    }
+  }
+}

data/templates/kitchen/Dockerfile-rhel ADDED

@@ -0,0 +1,23 @@
+FROM yjjy0921/redhat7.2
+ENV container docker
+ARG RHSM_USERNAME
+ARG RHSM_PASSWORD
+RUN subscription-manager register --username $RHSM_USERNAME --password $RHSM_PASSWORD --auto-attach
+RUN yum clean all
+RUN yum install -y sudo openssh-server openssh-clients which curl
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
+RUN if ! getent passwd kitchen; then                 useradd -d /home/kitchen -m -s /bin/bash -p '*' kitchen;               fi
+RUN echo "kitchen ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+RUN echo "Defaults !requiretty" >> /etc/sudoers
+RUN mkdir -p /home/kitchen/.ssh
+RUN chown -R kitchen /home/kitchen/.ssh
+RUN chmod 0700 /home/kitchen/.ssh
+RUN touch /home/kitchen/.ssh/authorized_keys
+RUN chown kitchen /home/kitchen/.ssh/authorized_keys
+RUN chmod 0600 /home/kitchen/.ssh/authorized_keys
+RUN echo ssh-rsa\ AAAAB3NzaC1yc2EAAAADAQABAAABAQCplSn6Wo9fREERu3SPo9Gc8YMh2C6SDauPhcA6SREbAwd3hMulEIGfy2cZV28YvE/pRduU\+tJYTNfmMpBnyZ6xXjaGUns5eAoiqOur1Nwbtujz3FtqUHqvVIGhXEwLhXdbm3K\+7wzdlwkDlmpbBuFOPtn0ICLBR7gdZK1AAcTFuwtCbmQWJraKtl2FeQayZhp3wmTatl1dP6ypNQRLOa\+CmmJqocQwTODU8pakC3CpM2LXK7/AVRtO\+vnS/prPv4uP5xzHHy4f2TxAHZnV3NCUFjb5lrqH7nsMeW1O5yBTAKhJSCfRsfb2FFRL5w6u93ahtXbNMKkpwbhfXq1A\+DQ7\ kitchen_docker_key >> /home/kitchen/.ssh/authorized_keys

data/templates/kitchen/Vagrantfile-osx.rb ADDED

@@ -0,0 +1,10 @@
+Vagrant.configure("2") do |c|
+  c.vm.synced_folder ".", "/vagrant", disabled: true, :rsync__chown => false
+  c.vm.provider :virtualbox do |p|
+      p.customize ["setextradata", :id, "VBoxInternal/Devices/efi/0/Config/DmiSystemProduct", "MacBookPro11,3"]
+      p.customize ["setextradata", :id, "VBoxInternal/Devices/efi/0/Config/DmiSystemVersion", "1.0"]
+      p.customize ["setextradata", :id, "VBoxInternal/Devices/efi/0/Config/DmiBoardProduct", "Mac-2BD1B31983FE1663"]
+      p.customize ["setextradata", :id, "VBoxInternal/Devices/smc/0/Config/DeviceKey", "ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc"]
+      p.customize ["setextradata", :id, "VBoxInternal/Devices/smc/0/Config/GetKeyFromRealSMC", 1]
+  end
+end

data/templates/kitchen/docker_id_rsa ADDED

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAqZUp+lqPX0RBEbt0j6PRnPGDIdgukg2rj4XAOkkRGwMHd4TL
+pRCBn8tnGVdvGLxP6UXblPrSWEzX5jKQZ8mesV42hlJ7OXgKIqjrq9TcG7bo89xb
+alB6r1SBoVxMC4V3W5tyvu8M3ZcJA5ZqWwbhTj7Z9CAiwUe4HWStQAHExbsLQm5k
+Fia2irZdhXkGsmYad8Jk2rZdXT+sqTUESzmvgppiaqHEMEzg1PKWpAtwqTNi1yu/
+wFUbTvr50v6az7+Lj+ccxx8uH9k8QB2Z1dzQlBY2+Za6h+57DHltTucgUwCoSUgn
+0bH29hRUS+cOrvd2obV2zTCpKcG4X16tQPg0OwIDAQABAoIBAQCWYqdVUtXt/9NM
+bFZTw0zxxuMpMlMqRmEr58quZXl74NXQUb1eZiLtmC2XtYfaAbVEAyVVGpFKqOqV
+Q6X3xD6swAXOXHrWXfNvBSnpudxv32b6SyHuR+xka6aBeB4f4X4ViObbF5brMzNV
+MSCkFJfdEbOq4Iyxpm5J8qwJJQhg56ri5Tk+DZqZnT/LvMw4lEWXEAFDqZhuW5ED
+V/HO5b37QB4+0nn0j8dJiZHIUmjsixUX1u+zGKqsQRUCkN9DSe9iUVSrjOPleHDP
++GAc65lZ2D8HLL0ELtNnWecks9UirUzF5Du30QR84naIts+9wUU7XtjnUbIrtvuO
+UBkPMlOBAoGBANLxbHKwcssGh+Kjp3eWfp88zYg8gHUQ2RqZxTQZopMrDBOuTvIv
+ifrUaOPgyOIQfol0UgwEXjYzMILWOfCzRcVQQu/FH7YYzKWMmTtRCoa/NBF9e7ev
+cyKB5flq5zvTtJ4dTM+u+KKtiGHbtkHKZ3UJw8YgZVHLqzdhjODZ98zbAoGBAM3O
+HPYqnxmRYQzRkio0s4VvUGkN543JxV/FTtwr0CiA+Dy3OnVLWFii7nLXHboltH+V
+ziwZu52ht2mo75zDjfIRFoDWMHz+nelgzEO20UquBFU31OcpX3KOMybvgC359fsF
+0p5yAfasHjvqGgQ9zws4PE6I22dOiuZ9n3H3KCQhAoGAbGYgArfl5asPfUn4Lx4p
+J49JV28v2/iyeFb43hMmVlZSuHJko1QGpd0toZzL3k/3lo8t8nr0JwobLcEEuUqG
+2iSqoSg9aYhI8fHUdITq0d/D1BEV2IjSs7LpCUkEVtwt/uqzpC4YGxDt+su7Vwe6
+Loy8DD5tkqEE9Uqt6IZaLu0CgYEAuc38F8MjINI/7HLIo5IxAacd0brb8wbXSz+3
+ks97fxXxB9/kx0De4ic3YDcWf5jK/OUi3m3dFNOL47jBm6Zx4LnMt0SpQjAeITVj
+NT84dVPmVYmyjYCsy5/WTrCr6NZjXd5D6QjE/Q8nvK/+DRZAdsCusbidXQdsH+wK
+p7mcZAECgYEAhs7753iVdZmgfEo/rl39BU2/rxdGElSDXauOs92ybCfbMi4GqKlJ
+vWJwwE/Doek5K7743upUIICqGUpghkJqwiFH2mn1++gL9LuejSzy/xkoWF9MQZgg
+bJYXQ1E/Gr6gOBimjEZzuPKj/fQ6EWo+3nWbB+EjOWS5ZhZCAEIqvjA=
+-----END RSA PRIVATE KEY-----

data/templates/kitchen/docker_id_rsa.pub ADDED

@@ -0,0 +1 @@

+ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCplSn6Wo9fREERu3SPo9Gc8YMh2C6SDauPhcA6SREbAwd3hMulEIGfy2cZV28YvE/pRduU+tJYTNfmMpBnyZ6xXjaGUns5eAoiqOur1Nwbtujz3FtqUHqvVIGhXEwLhXdbm3K+7wzdlwkDlmpbBuFOPtn0ICLBR7gdZK1AAcTFuwtCbmQWJraKtl2FeQayZhp3wmTatl1dP6ypNQRLOa+CmmJqocQwTODU8pakC3CpM2LXK7/AVRtO+vnS/prPv4uP5xzHHy4f2TxAHZnV3NCUFjb5lrqH7nsMeW1O5yBTAKhJSCfRsfb2FFRL5w6u93ahtXbNMKkpwbhfXq1A+DQ7 kitchen_docker_key

data/templates/kitchen/kitchen.aws.yml.erb CHANGED

@@ -1,16 +1,19 @@
 ---
-driver_config:
-  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
-  aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+driver:
+  name: ec2
   aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
-  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-  security_group_ids:
-    - fhcap-test
+  region: <%= ENV['EC2_REGION'] %>
+  subnet_id: <%= ENV['EC2_SUBNET_ID'] %>
+  security_group_ids: <%= ENV['EC2_SECURITY_GROUP_ID'] %>
+  instance_type: <%= ENV['EC2_INSTANCE_TYPE'] %>
   tags:
     Name: test-kitchen <%= Socket.gethostname %> (<%= Etc.getlogin %>)
     OriginHostname: <%= Socket.gethostname %>
     OriginUsername: <%= Etc.getlogin %>
-    OriginGitBranch: <%= `git name-rev --name-only HEAD` %>
+transport:
+  name: sftp
+  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
 provisioner:
   name: chef_solo
@@ -26,10 +29,30 @@ provisioner:
 platforms:
   - name: ubuntu-12.04
-    driver_plugin: ec2
-    driver_config:
-      flavor_id: <%= ENV['EC2_FLAVOR_ID'] || 'm1.small' %>
-      image_id: <%= ENV['EC2_IMAGE_ID'] || 'ami-92cc89e5' %>
-      availability_zone: <%= ENV['EC2_AVAILABILITY_ZONE'] || 'eu-west-1a' %>
-      region: <%= ENV['EC2_REGION'] || 'eu-west-1' %>
-      username: ubuntu
+    provisioner:
+      require_chef_omnibus: 11.10.4
+  - name: centos-6.5
+    driver:
+      image_search:
+        name: 'Feedhenry CentOS 6.5 Base AMI HVM V2'
+        virtualization-type: hvm
+    transport:
+      username: centos
+    provisioner:
+      require_chef_omnibus: 11.10.4
+    busser:
+      sudo: true
+  - name: centos-7
+    provisioner:
+      require_chef_omnibus: 12.15.19
+    busser:
+      sudo: true
+  - name: rhel-7.2
+    provisioner:
+      require_chef_omnibus: 12.15.19
+    busser:
+      sudo: true
+    attributes:
+      rhsm:
+        username: <%= ENV['RHSM_USERNAME'] %>
+        password: <%= ENV['RHSM_PASSWORD'] %>

data/templates/kitchen/kitchen.docker.yml.erb CHANGED

@@ -1,9 +1,14 @@
 ---
+driver:
+  name: docker
+  use_sudo: false
 driver_plugin: docker
 driver_config:
   publish_all: true
   disable_upstart: false
   privileged: true
+transport:
+  name: sftp
 provisioner:
   name: chef_zero
   data_bags_path: ../../data_bags
@@ -16,6 +21,34 @@ provisioner:
   require_chef_omnibus: 11.10.4
 platforms:
   - name: ubuntu-12.04
+    provisioner:
+      require_chef_omnibus: 11.10.4
+  - name: centos-6.5
+    provisioner:
+      require_chef_omnibus: 11.10.4
+    busser:
+      sudo: true
   - name: centos-7
+    provisioner:
+      require_chef_omnibus: 12.15.19
+    busser:
+      sudo: true
+  - name: rhel-7.2
+    provisioner:
+      require_chef_omnibus: 12.15.19
     busser:
-      sudo: true
+      sudo: true
+    driver_config:
+      image: yjjy0921/redhat7.2
+      platform: rhel
+      dockerfile: ./Dockerfile-rhel
+      use_cache: false
+      public_key: ./docker_id_rsa.pub
+      private_key: ./docker_id_rsa
+      build_options:
+        - build-arg: RHSM_USERNAME=<%= ENV['RHSM_USERNAME'] %>
+        - build-arg: RHSM_PASSWORD=<%= ENV['RHSM_PASSWORD'] %>
+    attributes:
+      rhsm:
+        username: <%= ENV['RHSM_USERNAME'] %>
+        password: <%= ENV['RHSM_PASSWORD'] %>