diff options
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 3 | ||||
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index d78ff7fd..bf2c86c4 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -49,7 +49,7 @@ parameters: CephAnsibleUpgradePlaybook: type: string description: Path to the ceph-ansible playbook to execute on upgrade - default: /usr/share/ceph-ansible/infrastructure-playbooks/take-over-existing-cluster.yml + default: /usr/share/ceph-ansible/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml CephAnsibleExtraConfig: type: json description: Extra vars for the ceph-ansible playbook @@ -184,6 +184,7 @@ outputs: ireallymeanit: 'yes' fsid: { get_param: CephClusterFSID } docker: true + ceph_release: jewel ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]} ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]} ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]} diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 4cce23d9..81bb1c20 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -78,6 +78,37 @@ outputs: owner: neutron:neutron recurse: true docker_config: + step_3: + neutron_ovs_bridge: + detach: false + image: {get_param: DockerNeutronConfigImage} + net: host + pid: host + user: root + privileged: true + command: + - puppet + - apply + - --modulepath + - /etc/puppet/modules:/usr/share/openstack-puppet/modules + - --tags + - file,file_line,concat,augeas,neutron::plugins::ovs::bridge + - -v + - -e + - include neutron::agents::ml2::ovs + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /lib/modules:/lib/modules:ro + - /run:/run + - /etc/puppet:/etc/puppet:ro + - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro + - /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS step_4: neutron_ovs_agent: image: {get_param: DockerOpenvswitchImage} |