auto sync charmhelpers
This commit is contained in:
Ryan Beisner
parent
c9b9b6eb53
commit
40781bfd20
|
|
@ -101,7 +101,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
|||
"""
|
||||
(self.precise_essex, self.precise_folsom, self.precise_grizzly,
|
||||
self.precise_havana, self.precise_icehouse,
|
||||
self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
|
||||
self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
|
||||
self.utopic_juno, self.vivid_kilo) = range(10)
|
||||
releases = {
|
||||
('precise', None): self.precise_essex,
|
||||
('precise', 'cloud:precise-folsom'): self.precise_folsom,
|
||||
|
|
@ -110,7 +111,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
|||
('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
|
||||
('trusty', None): self.trusty_icehouse,
|
||||
('trusty', 'cloud:trusty-juno'): self.trusty_juno,
|
||||
('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
|
||||
('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
|
||||
('utopic', None): self.utopic_juno,
|
||||
('vivid', None): self.vivid_kilo}
|
||||
return releases[(self.series, self.openstack)]
|
||||
|
||||
def _get_openstack_release_string(self):
|
||||
|
|
|
|||
|
|
@ -459,6 +459,11 @@ class AMQPContext(OSContextGenerator):
|
|||
|
||||
ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
|
||||
|
||||
oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
|
||||
if oslo_messaging_flags:
|
||||
ctxt['oslo_messaging_flags'] = config_flags_parser(
|
||||
oslo_messaging_flags)
|
||||
|
||||
if not context_complete(ctxt):
|
||||
return {}
|
||||
|
||||
|
|
|
|||
|
|
@ -524,9 +524,10 @@ def git_clone_and_install(projects_yaml, core_project):
|
|||
projects = yaml.load(projects_yaml)
|
||||
_git_validate_projects_yaml(projects, core_project)
|
||||
|
||||
old_environ = dict(os.environ)
|
||||
|
||||
if 'http_proxy' in projects.keys():
|
||||
os.environ['http_proxy'] = projects['http_proxy']
|
||||
|
||||
if 'https_proxy' in projects.keys():
|
||||
os.environ['https_proxy'] = projects['https_proxy']
|
||||
|
||||
|
|
@ -544,6 +545,8 @@ def git_clone_and_install(projects_yaml, core_project):
|
|||
repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
|
||||
update_requirements=True)
|
||||
|
||||
os.environ = old_environ
|
||||
|
||||
|
||||
def _git_validate_projects_yaml(projects, core_project):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -14,16 +14,12 @@
|
|||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import logging
|
||||
import os
|
||||
from os.path import join as path_join
|
||||
from os.path import exists
|
||||
import subprocess
|
||||
|
||||
|
||||
log = logging.getLogger("service_ca")
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
from charmhelpers.core.hookenv import log, DEBUG
|
||||
|
||||
STD_CERT = "standard"
|
||||
|
||||
|
|
@ -62,7 +58,7 @@ class ServiceCA(object):
|
|||
###############
|
||||
|
||||
def init(self):
|
||||
log.debug("initializing service ca")
|
||||
log("initializing service ca", level=DEBUG)
|
||||
if not exists(self.ca_dir):
|
||||
self._init_ca_dir(self.ca_dir)
|
||||
self._init_ca()
|
||||
|
|
@ -119,7 +115,7 @@ class ServiceCA(object):
|
|||
'-keyout', self.ca_key, '-out', self.ca_cert,
|
||||
'-outform', 'PEM']
|
||||
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
|
||||
log.debug("CA Init:\n %s", output)
|
||||
log("CA Init:\n %s" % output, level=DEBUG)
|
||||
|
||||
def get_conf_variables(self):
|
||||
return dict(
|
||||
|
|
@ -163,15 +159,15 @@ class ServiceCA(object):
|
|||
subj = '/O=%(org_name)s/OU=%(org_unit_name)s/CN=%(common_name)s' % (
|
||||
template_vars)
|
||||
|
||||
log.debug("CA Create Cert %s", common_name)
|
||||
log("CA Create Cert %s" % common_name, level=DEBUG)
|
||||
cmd = ['openssl', 'req', '-sha1', '-newkey', 'rsa:2048',
|
||||
'-nodes', '-days', self.default_expiry,
|
||||
'-keyout', key_p, '-out', csr_p, '-subj', subj]
|
||||
subprocess.check_call(cmd)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
cmd = ['openssl', 'rsa', '-in', key_p, '-out', key_p]
|
||||
subprocess.check_call(cmd)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
|
||||
log.debug("CA Sign Cert %s", common_name)
|
||||
log("CA Sign Cert %s" % common_name, level=DEBUG)
|
||||
if self.cert_type == MYSQL_CERT:
|
||||
cmd = ['openssl', 'x509', '-req',
|
||||
'-in', csr_p, '-days', self.default_expiry,
|
||||
|
|
@ -182,8 +178,8 @@ class ServiceCA(object):
|
|||
'-extensions', 'req_extensions',
|
||||
'-days', self.default_expiry, '-notext',
|
||||
'-in', csr_p, '-out', crt_p, '-subj', subj, '-batch']
|
||||
log.debug("running %s", " ".join(cmd))
|
||||
subprocess.check_call(cmd)
|
||||
log("running %s" % " ".join(cmd), level=DEBUG)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
|
||||
def get_ca_bundle(self):
|
||||
with open(self.ca_cert) as fh:
|
||||
|
|
|
|||
|
|
@ -14,16 +14,12 @@
|
|||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import logging
|
||||
import os
|
||||
from os.path import join as path_join
|
||||
from os.path import exists
|
||||
import subprocess
|
||||
|
||||
|
||||
log = logging.getLogger("service_ca")
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
from charmhelpers.core.hookenv import log, DEBUG
|
||||
|
||||
STD_CERT = "standard"
|
||||
|
||||
|
|
@ -62,7 +58,7 @@ class ServiceCA(object):
|
|||
###############
|
||||
|
||||
def init(self):
|
||||
log.debug("initializing service ca")
|
||||
log("initializing service ca", level=DEBUG)
|
||||
if not exists(self.ca_dir):
|
||||
self._init_ca_dir(self.ca_dir)
|
||||
self._init_ca()
|
||||
|
|
@ -119,7 +115,7 @@ class ServiceCA(object):
|
|||
'-keyout', self.ca_key, '-out', self.ca_cert,
|
||||
'-outform', 'PEM']
|
||||
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
|
||||
log.debug("CA Init:\n %s", output)
|
||||
log("CA Init:\n %s" % output, level=DEBUG)
|
||||
|
||||
def get_conf_variables(self):
|
||||
return dict(
|
||||
|
|
@ -163,15 +159,15 @@ class ServiceCA(object):
|
|||
subj = '/O=%(org_name)s/OU=%(org_unit_name)s/CN=%(common_name)s' % (
|
||||
template_vars)
|
||||
|
||||
log.debug("CA Create Cert %s", common_name)
|
||||
log("CA Create Cert %s" % common_name, level=DEBUG)
|
||||
cmd = ['openssl', 'req', '-sha1', '-newkey', 'rsa:2048',
|
||||
'-nodes', '-days', self.default_expiry,
|
||||
'-keyout', key_p, '-out', csr_p, '-subj', subj]
|
||||
subprocess.check_call(cmd)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
cmd = ['openssl', 'rsa', '-in', key_p, '-out', key_p]
|
||||
subprocess.check_call(cmd)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
|
||||
log.debug("CA Sign Cert %s", common_name)
|
||||
log("CA Sign Cert %s" % common_name, level=DEBUG)
|
||||
if self.cert_type == MYSQL_CERT:
|
||||
cmd = ['openssl', 'x509', '-req',
|
||||
'-in', csr_p, '-days', self.default_expiry,
|
||||
|
|
@ -182,8 +178,8 @@ class ServiceCA(object):
|
|||
'-extensions', 'req_extensions',
|
||||
'-days', self.default_expiry, '-notext',
|
||||
'-in', csr_p, '-out', crt_p, '-subj', subj, '-batch']
|
||||
log.debug("running %s", " ".join(cmd))
|
||||
subprocess.check_call(cmd)
|
||||
log("running %s" % " ".join(cmd), level=DEBUG)
|
||||
subprocess.check_call(cmd, stderr=subprocess.PIPE)
|
||||
|
||||
def get_ca_bundle(self):
|
||||
with open(self.ca_cert) as fh:
|
||||
|
|
|
|||
Loading…
Reference in New Issue