Skip to content

Commit

Permalink
bds -> abds
Browse files Browse the repository at this point in the history
  • Loading branch information
lee212 committed Sep 21, 2016
1 parent 70e4004 commit 73559ad
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions boot-ec2-with-vpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
gather_facts: False
vars:
keypair: hrlee
security_group: bds_secgroup
security_group: abds_secgroup
instance_size: t2.micro
image: ami-2d39803a # Ubuntu 14.04
region: us-east-1
Expand All @@ -27,16 +27,16 @@
- proto: all
cidr_ip: 0.0.0.0/0
# group_name: example-secgroup
group_desc: ec2 secgroup for bds
- name: bds-vc node first two
group_desc: ec2 secgroup for abds
- name: abds-vc node first two
ec2:
key_name: "{{ keypair }}"
instance_type: "{{ instance_size }}"
image: "{{ image }}"
wait: yes # or true?
region: "{{ region }}"
exact_count: 2
count_tag: bds-first-two
count_tag: abds-first-two
group: [ 'default', "{{ security_group }}" ]
instance_tags:
namenodes: True
Expand All @@ -50,15 +50,15 @@
vpc_subnet_id: "{{ subnet }}"
assign_public_ip: yes
register: node_first_two
- name: bds-vc node last
- name: abds-vc node last
ec2:
key_name: "{{ keypair }}"
instance_type: "{{ instance_size }}"
image: "{{ image }}"
wait: yes # or true?
region: "{{ region }}"
exact_count: 1
count_tag: bds-last-one
count_tag: abds-last-one
group: [ 'default', "{{ security_group }}" ]
instance_tags:
namenodes: True
Expand Down
8 changes: 4 additions & 4 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/EC2forBDS.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/EC2forABDS.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/EC2forBDS.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/EC2forABDS.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/EC2forBDS"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/EC2forBDS"
@echo "# mkdir -p $$HOME/.local/share/devhelp/EC2forABDS"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/EC2forABDS"
@echo "# devhelp"

epub:
Expand Down
14 changes: 7 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# EC2 for BDS documentation build configuration file, created by
# EC2 for ABDS documentation build configuration file, created by
# sphinx-quickstart on Fri Sep 16 00:52:49 2016.
#
# This file is execfile()d with the current directory set to its
Expand Down Expand Up @@ -43,7 +43,7 @@
master_doc = 'index'

# General information about the project.
project = u'EC2 for BDS'
project = u'EC2 for ABDS'
copyright = u'2016, Hyungro Lee'

# The version info for the project you're documenting, acts as replacement for
Expand Down Expand Up @@ -176,7 +176,7 @@
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'EC2forBDSdoc'
htmlhelp_basename = 'EC2forABDSdoc'


# -- Options for LaTeX output ---------------------------------------------
Expand All @@ -196,7 +196,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'EC2forBDS.tex', u'EC2 for BDS Documentation',
('index', 'EC2forABDS.tex', u'EC2 for ABDS Documentation',
u'Hyungro Lee', 'manual'),
]

Expand Down Expand Up @@ -226,7 +226,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'ec2forbds', u'EC2 for BDS Documentation',
('index', 'ec2forabds', u'EC2 for ABDS Documentation',
[u'Hyungro Lee'], 1)
]

Expand All @@ -240,8 +240,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'EC2forBDS', u'EC2 for BDS Documentation',
u'Hyungro Lee', 'EC2forBDS', 'One line description of project.',
('index', 'EC2forABDS', u'EC2 for ABDS Documentation',
u'Hyungro Lee', 'EC2forABDS', 'One line description of project.',
'Miscellaneous'),
]

Expand Down
6 changes: 3 additions & 3 deletions docs/source/ec2-instance-metadata-example.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
u'ec2_root_device_name': u'/dev/sda1',
u'ec2_root_device_type': u'ebs',
u'ec2_security_group_ids': u'sg-69ebc60c,sg-115b376b',
u'ec2_security_group_names': u'default,bds_secgroup',
u'ec2_security_group_names': u'default,abds_secgroup',
u'ec2_sourceDestCheck': u'true',
u'ec2_spot_instance_request_id': u'',
u'ec2_state': u'running',
Expand All @@ -243,7 +243,7 @@
u'ec2',
u'i-435014bb',
u'key_albert',
u'security_group_bds_secgroup',
u'security_group_abds_secgroup',
u'security_group_default',
u'tag_datanodes_True',
u'tag_frontendnodes_True',
Expand All @@ -268,7 +268,7 @@
u'key_albert': [u'52.23.213.103',
u'54.196.41.145',
u'54.209.137.235'],
u'security_group_bds_secgroup': [u'52.23.213.103',
u'security_group_abds_secgroup': [u'52.23.213.103',
u'54.196.41.145',
u'54.209.137.235'],
u'security_group_default': [u'52.23.213.103',
Expand Down
4 changes: 2 additions & 2 deletions docs/source/ec2-py-sample.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ec2_root_device_name": "/dev/sda1",
"ec2_root_device_type": "ebs",
"ec2_security_group_ids": "sg-69ebc60c,sg-115b376b",
"ec2_security_group_names": "default,bds_secgroup",
"ec2_security_group_names": "default,abds_secgroup",
"ec2_sourceDestCheck": "true",
"ec2_spot_instance_request_id": "",
"ec2_state": "running",
Expand Down Expand Up @@ -71,7 +71,7 @@
"key_albert": [
"54.85.130.171"
],
"security_group_bds_secgroup": [
"security_group_abds_secgroup": [
"54.85.130.171"
],
"security_group_default": [
Expand Down
4 changes: 2 additions & 2 deletions docs/source/ec2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ BigData Stack requires.
site.yml with Include
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Three Ansible playbooks are provided to deploy BDS on ec2.
Three Ansible playbooks are provided to deploy ABDS on ec2.

- boot.yml: to start EC2 instances
- convert.yml: to provide inventory groups from dynamic inventory of ec2.
- example-project-nist-fingerprint-matching.yml: to run BDS playbooks
- example-project-nist-fingerprint-matching.yml: to run ABDS playbooks
8 changes: 4 additions & 4 deletions docs/source/ec2_facts_for_vars.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dns_name": "",
"ebs_optimized": false,
"groups": {
"sg-115b376b": "bds_secgroup",
"sg-115b376b": "abds_secgroup",
"sg-69ebc60c": "default"
},
"hypervisor": "xen",
Expand Down Expand Up @@ -65,7 +65,7 @@
"dns_name": "",
"ebs_optimized": false,
"groups": {
"sg-115b376b": "bds_secgroup",
"sg-115b376b": "abds_secgroup",
"sg-69ebc60c": "default"
},
"hypervisor": "xen",
Expand Down Expand Up @@ -114,7 +114,7 @@
"dns_name": "",
"ebs_optimized": false,
"groups": {
"sg-115b376b": "bds_secgroup",
"sg-115b376b": "abds_secgroup",
"sg-69ebc60c": "default"
},
"hypervisor": "xen",
Expand Down Expand Up @@ -161,7 +161,7 @@
"dns_name": "",
"ebs_optimized": false,
"groups": {
"sg-115b376b": "bds_secgroup",
"sg-115b376b": "abds_secgroup",
"sg-69ebc60c": "default"
},
"hypervisor": "xen",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. EC2 for BDS documentation master file, created by
.. EC2 for ABDS documentation master file, created by
sphinx-quickstart on Fri Sep 16 00:52:49 2016.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
12 changes: 6 additions & 6 deletions play.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
gather_facts: False
vars:
keypair: hrlee
security_group: bds_secgroup
security_group: abds_secgroup
image: ami-2d39803a # Ubuntu 14.04
region: us-east-1
vpcid: vpc-e6c17c83
Expand All @@ -24,16 +24,16 @@
- proto: all
cidr_ip: 0.0.0.0/0
# group_name: example-secgroup
group_desc: ec2 secgroup for bds
- name: bds-vc node first two
group_desc: ec2 secgroup for abds
- name: abds-vc node first two
ec2:
key_name: "{{ keypair }}"
instance_type: t2.micro
image: "{{ image }}"
wait: yes # or true?
region: "{{ region }}"
exact_count: 2
count_tag: bds-first-two
count_tag: abds-first-two
group: [ 'default', "{{ security_group }}" ]
instance_tags:
namenodes: True
Expand All @@ -47,15 +47,15 @@
vpc_subnet_id: "{{ subnet }}"
assign_public_ip: yes
register: node_first_two
- name: bds-vc node last
- name: abds-vc node last
ec2:
key_name: "{{ keypair }}"
instance_type: t2.micro
image: "{{ image }}"
wait: yes # or true?
region: "{{ region }}"
exact_count: 1
count_tag: bds-last-one
count_tag: abds-last-one
group: [ 'default', "{{ security_group }}" ]
instance_tags:
namenodes: True
Expand Down

0 comments on commit 73559ad

Please sign in to comment.