aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-17 19:34:18 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-01 18:21:14 +0000
commit90c0b369c01a2185fe86651f8ad9e0a172d6941d (patch)
treed114c0e64d937c3024ce9dc5d3d426bd38554f9d /mcp/salt-formulas
parente9d597db3a9e8a38577908f36f5f700e875d4d78 (diff)
[baremetal] MaaS: Enable HTTP proxy
Instead of using NAT on the mas01 node for all cluster node outgoing traffic, use the MaaS built-in proxy for APT traffic to leverage its caching capabilities too. Also enable the proxy for salt minions, so they can access public keyservers et al. Cleanup public DNS from kvm nodes, interferes with MaaS proxy. Add example config for global env proxy, but don't enable it: - default environment settings - /etc/environment (via reclass); The MaaS proxy will not be used (at least for now) on nodes: - cfg01; - mas01; NOTE: We can't yet drop the maas.pxe_nat state completely, as certain Openstack services are still accessed via public addresses from ctl nodes. JIRA: FUEL-317 JIRA: FUEL-318 Change-Id: I6c5f6872bb94afb838580571080e808bc262fc68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls9
1 files changed, 8 insertions, 1 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 5de4eee35..30c337c00 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -11,7 +11,14 @@
opendaylight_repo:
pkgrepo.managed:
- - ppa: {{ server.repo }}
+ # NOTE(armband): PPA handling behind proxy broken, define it explicitly
+ # https://github.com/saltstack/salt/pull/45224
+ # - ppa: {{ server.repo }}
+ - human_name: opendaylight-ppa
+ - name: deb http://ppa.launchpad.net/odl-team/nitrogen/ubuntu xenial main
+ - file: /etc/apt/sources.list.d/odl-team-ubuntu-nitrogen-xenial.list
+ - keyid: 49B07274951063870A8B7EAE7B8AA1A344C05248
+ - keyserver: keyserver.ubuntu.com
opendaylight:
pkg.installed: