summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/networks3
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls12
2 files changed, 8 insertions, 7 deletions
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 222a0726d..e9a9f5190 100755
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -35,3 +35,6 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
openstack subnet create --gateway ${PUBLIC_NET_GATEWAY} --no-dhcp \
--allocation-pool start=${POOL_START_IP},end=${POOL_END_IP} \
--network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
+
+# Discover compute hosts after they are registered
+salt -C 'I@nova:controller and *01*' state.sls_id nova_controller_discover_hosts nova
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 453d244c9..edacc7855 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -32,6 +32,10 @@ opendaylight_repo:
- name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main
- file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list
+opendaylight_service_mask:
+ service.masked:
+ - name: opendaylight
+
opendaylight:
pkg.installed:
- require:
@@ -43,19 +47,13 @@ opendaylight:
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
service.running:
- enable: true
+ - unmask: true
- watch:
- file: /opt/opendaylight/etc/jetty.xml
- file: /opt/opendaylight/bin/setenv
- ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
-# TODO: use service.masked state once salt get updated to 2017.7.0+
-service.mask:
- module.run:
- - m_name: opendaylight
- - require_in:
- - pkg: opendaylight
-
/opt/opendaylight/etc/jetty.xml:
file.managed:
- source: salt://opendaylight/files/jetty.xml