Move Juju service configuration to the config file
diff --git a/cloudlab-setup.yml b/cloudlab-setup.yml
index ccf1179..8c3ae3f 100644
--- a/cloudlab-setup.yml
+++ b/cloudlab-setup.yml
@@ -132,21 +132,6 @@
- name: Deploy OpenStack services with Juju
script: scripts/juju-setup.py
-# - pause: prompt="Hit return when all services have started successfully"
-
- - name: Set MTU for GRE tunneling
- shell: "juju set neutron-gateway instance-mtu=1400"
-
-# Disable all HTTPS for time being
- - name: Use HTTPS for keystone authentication
- shell: 'juju set keystone use-https=no'
-
- - name: Use HTTPS for all service endpoints
- shell: 'juju set keystone https-service-endpoints=False'
-
- - name: Use SSL for rabbitmq
- shell: 'juju set rabbitmq-server ssl=off'
-
- name: Add all Juju relations between services
script: scripts/juju-relations.py
@@ -199,8 +184,8 @@
dest=/usr/local/src/network-setup.sh
mode=0644
-# - name: Run network setup script
-# shell: ansible nova-cloud-controller -m script -u ubuntu -a "/usr/local/src/network-setup.sh"
+ - name: Run network setup script
+ shell: ansible nova-cloud-controller -m script -u ubuntu -a "/usr/local/src/network-setup.sh"
- name: Get public key
shell: cat {{ ansible_env['PWD'] }}/.ssh/id_rsa.pub
diff --git a/files/openstack.cfg b/files/openstack.cfg
index c274bd8..3dd1b95 100644
--- a/files/openstack.cfg
+++ b/files/openstack.cfg
@@ -2,7 +2,9 @@
openstack-origin: "cloud:trusty-kilo"
keystone:
admin-password: ""
+ https-service-endpoints: "True"
openstack-origin: "cloud:trusty-kilo"
+ use-https: "yes"
nova-cloud-controller:
network-manager: "Neutron"
openstack-origin: "cloud:trusty-kilo"
@@ -13,7 +15,16 @@
openstack-dashboard:
openstack-origin: "cloud:trusty-kilo"
neutron-gateway:
+ bridge-mappings: "physnet1:br-data,nat:br-nat"
+ flat-network-providers: "*"
+ instance-mtu: "1400"
openstack-origin: "cloud:trusty-kilo"
+ vlan-ranges: "physnet1:1000:2000,nat"
neutron-api:
openstack-origin: "cloud:trusty-kilo"
neutron-openvswitch:
+ bridge-mappings: "physnet1:br-data,nat:br-nat"
+ flat-network-providers: "*"
+ vlan-ranges: "physnet1:1000:2000,nat"
+rabbitmq-server:
+ ssl: "on"