Merge pull request #46 from RSE-Cambridge/bump-kolla-release

Move to latest kolla and kolla-ansible branches
RSE-Cambridge · Mar 29, 2019 · 3b177ac · 3b177ac
2 parents f171293 + 845b170
commit 3b177ac
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 369 deletions.
diff --git a/etc/kayobe/inventory/group_vars/controllers/network-interfaces b/etc/kayobe/inventory/group_vars/controllers/network-interfaces
@@ -14,11 +14,17 @@ bond0_net_bond_slaves:
   - enp3s0f0
   - enp3s0f1
 
+
 # Admin network IP information
 admin_oc_net_interface: "eno3.{{ admin_oc_net_vlan }}"
 # TODO: Currently using public_net as default gateway
 # admin_oc_net_gateway: "10.{{ admin_oc_net_vlan }}.0.1"
 
+# Public network IP information.
+# Currently on 1GbE
+public_net_interface: "eno3.{{ public_net_vlan }}"
+
+
 # Workload out-of-band management network IP information.
 oob_wl_net_interface: "{{ br_net_interface }}.{{ oob_wl_net_vlan }}"
 
@@ -40,9 +46,6 @@ tunnel_net_interface: "{{ br_net_interface }}.{{ tunnel_net_vlan }}"
 # External network IP information.
 external_net_interface: "{{ br_net_interface }}.{{ external_net_vlan }}"
 
-# Public network IP information.
-public_net_interface: "{{ br_net_interface }}.{{ public_net_vlan }}"
-
 # Storage network IP information.
 storage_net_interface: "{{ br_net_interface }}.{{ storage_net_vlan }}"
 

diff --git a/etc/kayobe/inventory/group_vars/seed/firewall b/etc/kayobe/inventory/group_vars/seed/firewall
@@ -68,10 +68,10 @@ firewallgen_ipv4_input_allow_rules:
     proto: udp
     destination: "172.17.0.1"
     comment: "hint: used by 'ntpd'"
-  - interface: "lo"
-    port: 53
-    proto: udp
-    comment: "hint: used by 'dnsmasq' in docker container 'bifrost_deploy'"
+  - interface: "{{ provision_oc_net_name | net_interface }}"
+    port: 4000
+    proto: tcp
+    destination: "{{ provision_oc_net_name | net_ip }}"
   - interface: "lo"
     port: 53
     proto: udp

diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups
@@ -14,6 +14,9 @@
 # Build container images on the seed by default.
 seed
 
+[docker-registry:children]
+seed
+
 ###############################################################################
 # Overcloud groups.
 

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -15,7 +15,8 @@ kolla_source_url: https://github.com/RSE-Cambridge/kolla
 
 # Version (branch, tag, etc.) of Kolla source code repository if type is
 # 'source'.
-kolla_source_version: refs/tags/cumulus/7.0.1.5
+#kolla_source_version: refs/tags/cumulus/7.0.1.5
+kolla_source_version: cumulus/rocky
 
 # Path to virtualenv in which to install kolla.
 #kolla_venv:
@@ -37,7 +38,8 @@ kolla_ansible_source_url: https://github.com/RSE-Cambridge/kolla-ansible
 
 # Version (branch, tag, etc.) of Kolla Ansible source code repository if type
 # is 'source'.
-kolla_ansible_source_version: refs/tags/cumulus/7.0.1.7
+#kolla_ansible_source_version: refs/tags/cumulus/7.0.1.7
+kolla_ansible_source_version: cumulus/rocky
 
 # Path to virtualenv in which to install kolla-ansible.
 #kolla_ansible_venv:
@@ -73,7 +75,7 @@ kolla_docker_namespace: rse-cambridge
 #kolla_docker_registry_password:
 
 # Kolla OpenStack release version. This should be a Docker image tag.
-kolla_openstack_release: 7.0.1.5
+kolla_openstack_release: 7.0.1.6
 
 # Dict mapping names of sources to their definitions for
 # kolla_install_type=source. See kolla.common.config for details.

diff --git a/etc/kayobe/kolla/config/keystone/policy.json b/etc/kayobe/kolla/config/keystone/policy.json
@@ -1,6 +1,6 @@
 {
     "accounting_required": "role:accounting",
-    "identity:list_user_projects": "rule:owner or rule:admin_and_matching_domain_id or rule:accounting_required",
-    "identity:list_users": "rule:cloud_admin or rule:admin_and_matching_domain_id or rule:accounting_required",
-    "identity:list_users_in_group": "rule:cloud_admin or rule:admin_and_matching_target_group_domain_id or rule:accounting_required"
+    "identity:list_users": "rule:admin_required or rule:accounting_required",
+    "identity:list_user_projects": "rule:admin_or_owner or rule:accounting_required",
+    "identity:list_users_in_group": "rule:admin_required or rule:accounting_required"
 }
diff --git a/etc/kayobe/kolla/config/prometheus/rules/system.rules b/etc/kayobe/kolla/config/prometheus/rules/system.rules
@@ -1,4 +1,6 @@
 {% raw %}
+
+groups:
 - name: example
   rules:
 

diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
@@ -20,57 +20,59 @@ enable_cadf_notifications: "yes"
 # add route to ceph-rgw group in haproxy
 enable_ceph_rgw_external: "yes"
 
+# opt into new docker packages
+docker_legacy_packages: False
+
+# add ceph exporter:
+enable_prometheus_external_ceph_mgr_exporter: "yes"
+
 # Projects to extracts metrics from with cASO
 caso_projects:
   - iris
   - iris-euclid
 
-# TODO: how to build these?
-#magnum_tag: pike2
-#keystone_tag: pike2
-
 # Container image tags.
 # These should be allowed to change independently, as services are updated.
-bifrost_tag: rocky
-caso_tag: 7.0.1.5
-cron_tag: rocky
-ceph_tag: rocky
-cinder_tag: rocky
-chrony_tag: rocky
-elasticsearch_tag: 7.0.1.2
-fluentd_tag: rocky
-glance_tag: rocky
-grafana_tag: rocky
-haproxy_tag: rocky
-heat_tag: rocky
-horizon_tag: rocky
-influxdb_tag: rocky
-ironic_tag: rocky
-iscsid_tag: rocky
-kafka_tag: rocky
-keepalived_tag: rocky
-keystone_tag: rocky
-kibana_tag: 7.0.1.2
-kolla_toolbox_tag: rocky
-logstash_tag: rocky
-magnum_tag: rocky
-manila_tag: rocky
-mariadb_tag: rocky
-memcached_tag: rocky
-monasca_tag: rocky
-monasca_notification_tag: rocky
-monasca_persister_tag: rocky
-neutron_tag: rocky
-nova_tag: rocky
-openvswitch_tag: rocky
-prometheus_tag: rocky
-prometheus_server_tag: 7.0.1.5
-prometheus_mtail_tag: 7.0.1.3
-prometheus_elasticsearch_exporter_tag: 7.0.1.4
-prometheus_libvirt_exporter_tag: 7.0.1.4
-rabbitmq_tag: rocky
-storm_tag: rocky
-zookeeper_tag: rocky
+bifrost_tag: 7.0.1.6
+caso_tag: 7.0.1.6
+cron_tag: 7.0.1.6
+ceph_tag: 7.0.1.6
+cinder_tag: 7.0.1.6
+chrony_tag: 7.0.1.6
+elasticsearch_tag: 7.0.1.6
+fluentd_tag: 7.0.1.6
+glance_tag: 7.0.1.6
+grafana_tag: 7.0.1.6
+haproxy_tag: 7.0.1.6
+heat_tag: 7.0.1.6
+horizon_tag: 7.0.1.6
+influxdb_tag: 7.0.1.6
+ironic_tag: 7.0.1.6
+iscsid_tag: 7.0.1.6
+kafka_tag: 7.0.1.6
+keepalived_tag: 7.0.1.6
+keystone_tag: 7.0.1.6
+kibana_tag: 7.0.1.6
+kolla_toolbox_tag: 7.0.1.6
+logstash_tag: 7.0.1.6
+magnum_tag: 7.0.1.6
+manila_tag: 7.0.1.6
+mariadb_tag: 7.0.1.6
+memcached_tag: 7.0.1.6
+monasca_tag: 7.0.1.6
+monasca_notification_tag: 7.0.1.6
+monasca_persister_tag: 7.0.1.6
+neutron_tag: 7.0.1.6
+nova_tag: 7.0.1.6
+openvswitch_tag: 7.0.1.6
+prometheus_tag: 7.0.1.6
+prometheus_server_tag: 7.0.1.6
+prometheus_mtail_tag: 7.0.1.6
+prometheus_elasticsearch_exporter_tag: 7.0.1.6
+prometheus_libvirt_exporter_tag: 7.0.1.6
+rabbitmq_tag: 7.0.1.6
+storm_tag: 7.0.1.6
+zookeeper_tag: 7.0.1.6
 
 # Kayobe currently configures ntpd on each node in the overcloud
 enable_chrony: false

diff --git a/etc/kayobe/kolla/inventory/overcloud-components.j2 b/etc/kayobe/kolla/inventory/overcloud-components.j2
@@ -164,7 +164,8 @@ control
 control
 
 [ceph:children]
-control
+#control
+storage
 
 [magnum:children]
 control
@@ -264,15 +265,29 @@ control
 
 # Cinder
 [cinder-api:children]
-cinder
+control
 
 [cinder-backup:children]
-cinder
-#storage
+control
 
 [cinder-scheduler:children]
-cinder
+control
 
 [cinder-volume:children]
-cinder
-#storage
+control
+
+[prometheus-elasticsearch-exporter:children]
+elasticsearch
+
+[prometheus-libvirt-exporter:children]
+compute
+
+[prometheus-openstack-exporter:children]
+monitoring
+
+[prometheus-mtail:children]
+monitoring
+control
+compute
+network
+storage