Improved configuration #14

misterbisson · 2016-04-18T01:36:07Z

Adding setup script per Add setup.sh and demo.sh scripts #12
Fixing env var name per TRITON_MYSQL_CONSUL vs CONSUL as environment variable in triton-mysql.py #11
Attempting to remove need for docs around Manta keys for Improve docs around Manta keys #5
~~Replaces Gitter badge PR, Add a Gitter chat badge to README.md #8~~ separately in Adding badges #15

misterbisson · 2016-04-18T01:38:17Z

bin/triton-mysql.py

@@ -32,7 +32,7 @@

 log = logging.getLogger('triton-mysql')

-consul = pyconsul.Consul(host=os.environ.get('TRITON_MYSQL_CONSUL', 'consul'))
+consul = pyconsul.Consul(host=os.environ.get('CONSUL', 'consul'))


misterbisson · 2016-04-18T01:40:46Z

bin/triton-mysql.py

@@ -175,7 +175,7 @@ def __init__(self):
        self.user = os.environ.get('MANTA_SUBUSER', None)
        self.role = os.environ.get('MANTA_ROLE', None)
        self.key_id = os.environ.get('MANTA_KEY_ID', None)
-        self.private_key = os.environ.get('MANTA_PRIVATE_KEY')
+        self.private_key = os.environ.get('MANTA_PRIVATE_KEY') # @TODO: need changes here


This will need to be aware of the text munging of the input.

This should do it:

self.private_key = os.environ.get('MANTA_PRIVATE_KEY').replace('#', '\n')

misterbisson · 2016-04-18T01:52:40Z

Dockerfile

-    percona-xtrabackup \
+        python \
+        python-dev \
+        gcc \


I'd love to try adding the pip install steps in here so we can apt-get purge GCC after it's done its job, similar to https://github.com/autopilotpattern/nfsserver/blob/wip/Dockerfile#L8-L19.

tgross · 2016-04-18T14:05:59Z

setup.sh

+    fi
+
+    # setup environment file
+    echo '# Environment variables for MySQL service' > _env


Should we do a check for the existence of this file?

Yeah. I called you on that, I need to do the same.

…-and-demo-scripts

tgross · 2016-04-20T12:28:28Z

setup.sh

+        echo 'MANTA_ROLE=' >> _env
+
+        # MANTA_KEY_ID must be the md5 formatted key fingerprint. A SHA256 will result in errors.
+        echo MANTA_KEY_ID=$(ssh-keygen -E md5 -lf ${MANTA_PUBLIC_KEY_PATH} | awk '{print substr($2,5)}') >> _env


It occurs to me that rather than asking the user for their public key, we can just take the private key they're giving us and then fetching the signature from there. For example:

ssh-keygen -yl -E md5 -f ~/.ssh/timgross-joyent_id_rsa | awk '{print substr($2,5)}' 46:cc:9a:2d:66:83:1f:83:ce:01:74:5f:16:dc:b7:2d

That'd be one less argument to parse and one less place for user error to creep in.

tgross · 2016-04-20T12:29:44Z

Added one more comment about maybe dropping the requirement to provide both public and private keys if all we need is the ID, but other than that LGTM.

misterbisson · 2016-04-20T16:21:07Z

bin/triton-mysql.py

@@ -175,7 +175,7 @@ def __init__(self):
        self.user = os.environ.get('MANTA_SUBUSER', None)
        self.role = os.environ.get('MANTA_ROLE', None)
        self.key_id = os.environ.get('MANTA_KEY_ID', None)
-        self.private_key = os.environ.get('MANTA_PRIVATE_KEY')
+        self.private_key = os.environ.get('MANTA_PRIVATE_KEY').replace('#', '\n')


Error:

Traceback (most recent call last): File "/usr/local/bin/triton-mysql.py", line 955, in <module> manta_config = Manta() File "/usr/local/bin/triton-mysql.py", line 178, in __init__ self.private_key = os.environ.get('MANTA_PRIVATE_KEY').replace('#', '\n') AttributeError: 'NoneType' object has no attribute 'replace' 2016/04/20 16:17:46 exit status 1

This was caused by MANTA_PRIVATE_KEY being unset in the docker-compose.yml file. That was fixed in 9239d16

with just the private key

tgross · 2016-04-20T19:09:05Z

setup.sh

+        echo 'MANTA_URL=https://us-east.manta.joyent.com' >> _env
+
+        # MANTA_KEY_ID must be the md5 formatted key fingerprint. A SHA256 will result in errors.
+        echo MANTA_KEY_ID=$(ssh-keygen -yl -E md5 -f ${MANTA_PRIVATE_KEY_PATH} | awk '{print substr($2,5)}') >> _env


~~The awk expression here should just be '{print $2}'. We want to keep the "MD5" at the front of the string.~~

Nevermind... I think I had a stale build or something.

tgross · 2016-04-20T21:03:27Z

README.md

- `MANTA_ROLE`: the Manta role name, if any.
- `MANTA_KEY_ID`: the MD5-format ssh key id for the Manta account/subuser (ex. `1a:b8:30:2e:57:ce:59:1d:16:f6:19:97:f2:60:2b:3d`).
- `MANTA_PRIVATE_KEY`: the private ssh key for the Manta account/subuser.
- `MANTA_BUCKET`: the path on Manta where backups will be stored. (ex. `/myaccount/stor/triton-mysql`)
 - `LOG_LEVEL`: will set the logging level of the `triton-mysql.py` application. It defaults to `DEBUG` and uses the Python stdlib [log levels](https://docs.python.org/2/library/logging.html#levels). In production you'll want this to be at `INFO` or above.
 - `TRITON_MYSQL_CONSUL` is the hostname for the Consul instance(s). Defaults to `consul`.


We changed this to CONSUL

tgross · 2016-04-20T21:04:14Z

LGTM.

thanks to #14 (comment)

misterbisson added 2 commits April 17, 2016 18:12

added badges

63940ec

first pass through everything

eeb56bd

misterbisson reviewed Apr 18, 2016
View reviewed changes

misterbisson mentioned this pull request Apr 18, 2016

Add a Gitter chat badge to README.md #8

Closed

misterbisson reviewed Apr 18, 2016
View reviewed changes

oops, didn't mean to overwrite the .gitignore

e3e8bb5

misterbisson reviewed Apr 18, 2016
View reviewed changes

This was referenced Apr 18, 2016

Add explicit (separate) "docker-swarm" and "triton" docker-compose files #9

Closed

Wordpress autopilotpattern/wordpress#5

Merged

tgross reviewed Apr 18, 2016
View reviewed changes

misterbisson added 4 commits April 19, 2016 14:21

Merge branch 'master' of github.com:tgross/triton-mysql into 12-setup…

6b26dc3

…-and-demo-scripts

more cleanup

749f356

handling keys now

5cce24a

add dockerignore to prevent the _env file going to the builder

b53d8a7

tgross reviewed Apr 20, 2016
View reviewed changes

misterbisson reviewed Apr 20, 2016
View reviewed changes

misterbisson added 5 commits April 20, 2016 09:29

trying Tim's suggestion

68eb75a

with just the private key

quote the key string

34e55c5

one line, no quotes is fine

3dc9d66

no common compose, trying different key munging

69ca45c

revert my munging messing

e82ee84

tgross reviewed Apr 20, 2016
View reviewed changes

this was unsetting the MANTA_PRIVATE_KEY in the _env file

9239d16

misterbisson added 2 commits April 20, 2016 13:51

udpated readme for new config process

3505716

better introduce configuration needs

26b02e3

tgross reviewed Apr 20, 2016
View reviewed changes

it's CONSUL

4279577

thanks to #14 (comment)

misterbisson changed the title ~~WIP: Improved configuration~~ Improved configuration Apr 20, 2016

misterbisson merged commit 6ee9dc9 into master Apr 20, 2016

This was referenced Apr 21, 2016

Add setup.sh and demo.sh scripts #12

Closed

TRITON_MYSQL_CONSUL vs CONSUL as environment variable in triton-mysql.py #11

Closed

Improve docs around Manta keys #5

Closed

Update Compose files to 2.0 format #19

Closed

misterbisson deleted the 12-setup-and-demo-scripts branch June 9, 2016 22:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved configuration #14

Improved configuration #14

misterbisson commented Apr 18, 2016 •

edited

Loading

misterbisson Apr 18, 2016

misterbisson Apr 18, 2016

tgross Apr 18, 2016

misterbisson Apr 18, 2016 •

edited

Loading

tgross Apr 18, 2016

misterbisson Apr 19, 2016

tgross Apr 20, 2016

tgross commented Apr 20, 2016

misterbisson Apr 20, 2016

misterbisson Apr 20, 2016

tgross Apr 20, 2016 •

edited

Loading

tgross Apr 20, 2016

tgross commented Apr 20, 2016

Improved configuration #14

Improved configuration #14

Conversation

misterbisson commented Apr 18, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

misterbisson Apr 18, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgross commented Apr 20, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgross Apr 20, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgross commented Apr 20, 2016

misterbisson commented Apr 18, 2016 •

edited

Loading

misterbisson Apr 18, 2016 •

edited

Loading

tgross Apr 20, 2016 •

edited

Loading