summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--docs/cosmos-puppet-ops.mkd8
-rw-r--r--fabfile/__init__.py36
-rw-r--r--fabfile/db.py45
-rwxr-xr-xglobal/overlay/etc/puppet/cosmos_enc.py20
-rw-r--r--global/overlay/etc/puppet/puppet.conf1
6 files changed, 76 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index 8248ece..4c378d2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,5 +4,9 @@ cosmos:
upgrade:
fab upgrade
-bump:
- ./bump-tag
+db:
+ @python ./fabfile/db.py > global/overlay/etc/puppet/cosmos-db.yaml
+ @git add global/overlay/etc/puppet/cosmos-db.yaml && git commit -m "update db" global/overlay/etc/puppet/cosmos-db.yaml
+
+tag: db
+ ./bump-tag
diff --git a/docs/cosmos-puppet-ops.mkd b/docs/cosmos-puppet-ops.mkd
index 023c52c..46ceb50 100644
--- a/docs/cosmos-puppet-ops.mkd
+++ b/docs/cosmos-puppet-ops.mkd
@@ -210,6 +210,14 @@ as 'ro'. The read-only remote is used by multiverse scripts during host bootstra
# git remote add ro git://yourhost/myproj-cosmos.git
```
+Now edit .git/config and rename the 'master' branch to use the new 'origin' remote or
+you'll try to push to the multiverse remote! Finally create a branch for the 'multiverse'
+upstream so you can merge changes to multiverse:
+
+```
+# git checkout -b multiverse --track multiverse/master
+```
+
Note that you can maintain your repo on just about any git hosting platform, including
github, gitorius or your own local setup as long as it supports read-only "git://" access
to your repository. It is important that the remotes called 'origin' and 'ro' refer to
diff --git a/fabfile/__init__.py b/fabfile/__init__.py
index caf123f..d87fbdd 100644
--- a/fabfile/__init__.py
+++ b/fabfile/__init__.py
@@ -1,44 +1,23 @@
from fabric.api import run,env
-from fabric.operations import get
+from fabric.operations import get,put
import os
import yaml
import re
-
-def _all_hosts():
- return filter(lambda fn: '.' in fn and not fn.startswith('.') and os.path.isdir(fn),os.listdir("."))
-
-def _roledefs():
- rules = dict()
-
- rules_file = "cosmos-rules.yaml";
- if os.path.exists(rules_file):
- with open(rules_file) as fd:
- rules.update(yaml.load(fd))
-
- roles = dict()
- for node_name in _all_hosts():
- for reg,cls in rules.iteritems():
- if re.search(reg,node_name):
- for cls_name in cls.keys():
- h = roles.get(cls_name,[])
- h.append(node_name)
- roles[cls_name] = h
- return roles
+import sys
+from fabfile.db import cosmos_db
env.user = 'root'
env.timeout = 30
env.connection_attempts = 3
env.warn_only = True
env.skip_bad_hosts = True
-env.roledefs = _roledefs()
-
-#print repr(env.roledefs)
+env.roledefs = cosmos_db()['members']
def all():
- env.hosts = _all_hosts()
+ env.hosts = cosmos_db()['members']['all']
def cosmos():
- run("cosmos update && cosmos apply");
+ run("cosmos update ; cosmos -v apply");
def upgrade():
run("apt-get -qq update && apt-get -y -q dist-upgrade");
@@ -51,3 +30,6 @@ def chassis():
def newvm(fqdn,ip,domain):
run("vmbuilder kvm ubuntu --domain %s --dest /var/lib/libvirt/images/%s.img --arch x86_64 --hostname %s --mem 512 --ip %s --addpkg openssh-server" % (domain,fqdn,fqdn,ip))
+
+def cp(local,remote):
+ put(local,remote)
diff --git a/fabfile/db.py b/fabfile/db.py
new file mode 100644
index 0000000..129aa50
--- /dev/null
+++ b/fabfile/db.py
@@ -0,0 +1,45 @@
+import os
+import yaml
+import re
+
+def _all_hosts():
+ return filter(lambda fn: '.' in fn and not fn.startswith('.') and os.path.isdir(fn),os.listdir("."))
+
+def _load_db():
+ rules = dict()
+ rules_file = "cosmos-rules.yaml";
+ if os.path.exists(rules_file):
+ with open(rules_file) as fd:
+ rules.update(yaml.load(fd))
+
+ all_hosts = _all_hosts()
+
+ members = dict()
+ for node_name in all_hosts:
+ for reg,cls in rules.iteritems():
+ if re.search(reg,node_name):
+ for cls_name in cls.keys():
+ h = members.get(cls_name,[])
+ h.append(node_name)
+ members[cls_name] = h
+ members['all'] = all_hosts
+
+ classes = dict()
+ for node_name in all_hosts:
+ node_classes = dict()
+ for reg,cls in rules.iteritems():
+ if re.search(reg,node_name):
+ node_classes.update(cls)
+ classes[node_name] = node_classes
+
+ return dict(classes=classes,members=members)
+
+_db = None
+def cosmos_db():
+ global _db
+ if _db is None:
+ _db = _load_db()
+ return _db
+
+if __name__ == '__main__':
+ print yaml.dump(cosmos_db())
diff --git a/global/overlay/etc/puppet/cosmos_enc.py b/global/overlay/etc/puppet/cosmos_enc.py
index 63c3a66..131d161 100755
--- a/global/overlay/etc/puppet/cosmos_enc.py
+++ b/global/overlay/etc/puppet/cosmos_enc.py
@@ -5,20 +5,14 @@ import yaml
import os
import re
-rules_path = os.environ.get("COSMOS_RULES_PATH","/etc/puppet")
-
node_name = sys.argv[1]
-rules = dict()
-for p in rules_path.split(":"):
- rules_file = os.path.join(p,"cosmos-rules.yaml")
- if os.path.exists(rules_file):
- with open(rules_file) as fd:
- rules.update(yaml.load(fd))
+db_file = os.environ.get("COSMOS_ENC_DB","/etc/puppet/cosmos-db.yaml")
+db = dict(classes=dict())
+
+if os.path.exists(db_file):
+ with open(db_file) as fd:
+ db.update(yaml.load(fd))
-classes = dict()
-for reg,cls in rules.iteritems():
- if re.search(reg,node_name):
- classes.update(cls)
+print yaml.dump(dict(classes=db['classes'].get(node_name,dict()),parameters=dict(roles=db.get('members',[]))))
-print yaml.dump(dict(classes=classes))
diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf
index 0ba85f4..a269892 100644
--- a/global/overlay/etc/puppet/puppet.conf
+++ b/global/overlay/etc/puppet/puppet.conf
@@ -7,6 +7,7 @@ factpath=$vardir/lib/facter
templatedir=$confdir/templates
node_terminus = exec
external_nodes = /etc/puppet/cosmos_enc.py
+modulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules
[master]
# These are needed when the puppetmaster is run by passenger